Added configuration header files in lieu of preprocessor definitions. Also removed a bunch of unnecessary includes.