Move old include files out of the way
Makefile cleanup and version info