More Makefile cleanup and fixes to local includes
Reverted an over-correction
Merge branch 'make' into packet