Cleaned up includes / defines