Cleaned up headers, compilation should be faster