Moved static _make_ c++ functions to .cpp file