fixed up patching of the headers and .cpp's