Fixed #define and #include not reported to define.h file
Removed unused methods and imports.