Fixed things up with header file dependencies in the makes ystem