fixed Makefiles and includes