removed warnings from redifining #defines in some files