making build work for macs, cant have .h in the clang input
completing merge