Clean up headers and dependencies