fix include files, moved to makefile