code cleanup
- shouldn't need to include header files in Makefile sources