More Makefile cleanup and fixes to local includes