Split makefile.inc into 2 pieces to try and make makefile better