Minor restructuring of includes and Makefile