diff --git a/src/script_opt/CPP/Driver.cc b/src/script_opt/CPP/Driver.cc
index 45c0ffb7ac..3cf63d365b 100644
--- a/src/script_opt/CPP/Driver.cc
+++ b/src/script_opt/CPP/Driver.cc
@@ -63,6 +63,10 @@ void CPPCompile::Compile(bool report_uncompilable) {
                     (void)pfs->HashType(t);
                     rep_types.insert(TypeRep(t));
                 }
+		for ( auto& g : pf->Globals() )
+			accessed_globals.insert(g);
+		for ( auto& ag : pf->AllGlobals() )
+			all_accessed_globals.insert(ag);
             }
         }