fix mac compile
fix inconsistency between c++ implementations
start work to add generic include directory handling