General refactogin of inclusions, Makefiles and the like.