Make it build again up to the cmm point (it was missing some valuable header files).