Moved classes out of main_header.h into their own separate headers. Removed apparently superfluous dependencies.
Moved classes out of main_header.h into their own separate headers. Removed apparently superfluous dependencies.