finally got the makefile headers etc the way I want it...