Rejiggered many #includes and the Makefile
More Makefile rework, using .d files for dependencies