Removed obsolete $ from *.h files (svn-ism)
removed unused, empty file macros.h