Cleaned up inclusion of header files