diff --git a/sc2/src/uqm/planets/Makeinfo b/sc2/src/uqm/planets/Makeinfo
index 6ae142a0f..4f195e6f6 100644
--- a/sc2/src/uqm/planets/Makeinfo
+++ b/sc2/src/uqm/planets/Makeinfo
@@ -5,4 +5,4 @@ uqm_CFILES="calc.c cargo.c devices.c gentopo.c lander.c orbits.c
 uqm_HFILES="elemdata.h generate.h lander.h lifeform.h plandata.h planets.h
 		scan.h solarsys.h sundata.h"
 
-uqm_CXXFILES="pstarmap-modern.cpp"
+uqm_CXXFILES="pstarmap-modern.cpp generate-base.cpp"
diff --git a/sc2/src/uqm/planets/generate-base.cpp b/sc2/src/uqm/planets/generate-base.cpp
index f899bf184..5383a0ac8 100644
--- a/sc2/src/uqm/planets/generate-base.cpp
+++ b/sc2/src/uqm/planets/generate-base.cpp
@@ -16,6 +16,10 @@
 
 #include "uqm/planets/generate.h"
 
+#include <tuple>
+
+#include "uqm/planets/generate/gendefault.h"
+
 /*
  * XXX: Note that the way that defaults get called via C++ is a bit
  * indirect and wonky.  The genFunc C table calls into the C++
@@ -48,7 +52,7 @@
  * an example of that kind of glue.
  */
 
-namespace Planets  ::detail::  Generate
+namespace Planets  ::detail::  Generate_m
 {
 	Generator::~Generator()= default;
 
@@ -112,31 +116,32 @@ namespace Planets  ::detail::  Generate
 	}
 
 	bool
-	DefaultGenerator::generateName( SolarSystem *const solarSys, PLANET_DESC *const world )
+	DefaultGenerator::generateName( const SolarSystem *const solarSys,
+			const PLANET_DESC *const world )
 	{
 		return GenerateDefault_generateName( solarSys, world );
 	}
 
 
 	COUNT
-	DefaultGenerator::generateMinerals( SolarSystem *const solarSys, PLANET_DESC *const world,
-			const COUNT whichNode, NODE_INFO *const info )
+	DefaultGenerator::generateMinerals( const SolarSystem *const solarSys,
+			const PLANET_DESC *const world, const COUNT whichNode, NODE_INFO *const info )
 	{
 		return GenerateDefault_generateMinerals( solarSys, world, whichNode, info );
 	}
 
 
 	COUNT
-	DefaultGenerator::generateEnergy( SolarSystem *const solarSys, PLANET_DESC *const world,
-			const COUNT whichNode, NODE_INFO *const info )
+	DefaultGenerator::generateEnergy( const SolarSystem *const solarSys,
+			const PLANET_DESC *const world, const COUNT whichNode, NODE_INFO *const info )
 	{
 		return GenerateDefault_generateEnergy( solarSys, world, whichNode, info );
 	}
 
 
 	COUNT
-	DefaultGenerator::generateLife( SolarSystem *const solarSys, PLANET_DESC *const world,
-			const COUNT whichNode, NODE_INFO *const info )
+	DefaultGenerator::generateLife( const SolarSystem *const solarSys,
+			const PLANET_DESC *const world, const COUNT whichNode, NODE_INFO *const info )
 	{
 		return GenerateDefault_generateLife( solarSys, world, whichNode, info );
 	}