Removed unused header and reduced scope of #define