Re-order header includes and cleanup unused imports