Minor

This reorganizes the includes to decrease the compile time.