Removed obsolete macro definition and standardized #includes