adjusted Makefiles to put include files in the right place