Cleaned up #include's.
Cleaned up #define's.
Moved #define's around.