Fix a problem with package.mk being included too early