cleaned up includes, minimzed in the header files