Fix make dupe

Removed a duplicate source file entry in a Makefile that was leading to duplicate symbols at the link stage.  Also re-jiggged some header includes (one of which was circular!)