Clean up includes
Add headers as obj dependencies