changed makefiles to separate include dirs out of cflags