Re-organization of code.
included DebugDefines.h in necessary files