fixed up the rest of the include paths to fix compilation