packaging
remove the now unneccessary include path magic, fix some includes
ignore OSX whatnots