diff --git a/src/script_opt/CPP/Driver.cc b/src/script_opt/CPP/Driver.cc
index e16aab2d07..73829d383d 100644
--- a/src/script_opt/CPP/Driver.cc
+++ b/src/script_opt/CPP/Driver.cc
@@ -86,6 +86,9 @@ void CPPCompile::Compile(bool report_uncompilable) {
             }
         }
 
+        for ( auto& g : pfs->BiFGlobals() )
+            all_accessed_globals.insert(g);
+
         for ( auto& t : pfs->MainTypes() )
             if ( obj_matches_opt_files(t) == AnalyzeDecision::SHOULD )
                 rep_types.insert(TypeRep(t));