Headers added, paths changed in makefiles