Cleaned up the codebase, particularly header file inclusions.