Merge "Update makefiles for c++-sources and c++-headers." into oc-dev