All of those defines (should) not be used at any point in the code.
False positives may exist, because some macro names are getting
generated by some template/macro foo. This is the version which
compiled fine for me.

Also there are many commented out lines removed.

Change-Id: I6394024682e4ab3691eb72707a9363d41ba31df8