1 files changed, 8 insertions, 2 deletions
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 455b77c6e..33a161f78 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -5346,10 +5346,13 @@ bool CppGenerator::finishGeneration()
     s << endl;
 
     s << "// Current module's type array." << endl;
-    s << "PyTypeObject** " << cppApiVariableName() << ';' << endl;
+    s << "PyTypeObject** " << cppApiVariableName() << " = nullptr;" << endl;
+
+    s << "// Current module's PyObject pointer." << endl;
+    s << "PyObject* " << pythonModuleObjectName() << " = nullptr;" << endl;
 
     s << "// Current module's converter array." << endl;
-    s << "SbkConverter** " << convertersVariableName() << ';' << endl;
+    s << "SbkConverter** " << convertersVariableName() << " = nullptr;" << endl;
 
     const CodeSnipList snips = moduleEntry->codeSnips();
 
@@ -5520,6 +5523,9 @@ bool CppGenerator::finishGeneration()
     s << moduleName() << "_methods);" << endl;
     s << "#endif" << endl << endl;
 
+    s << INDENT << "// Make module available from global scope" << endl;
+    s << INDENT << pythonModuleObjectName() << " = module;" << endl << endl;
+
     //s << INDENT << "// Initialize converters for primitive types." << endl;
     //s << INDENT << "initConverters();" << endl << endl;