diff --git a/configure.py b/configure.py
index faf59836..06e92d5f 100644
--- a/configure.py
+++ b/configure.py
@@ -345,7 +345,7 @@ config.libs = [
         "progress_category": "library",
         "src_dir": "src/static",
         "objects": [
-            Object(NonMatching, "libforest/emu64/emu64.cc"),
+            Object(NonMatching, "libforest/emu64/emu64.cc", extra_cflags=["-lang=c++", "-O4,p", "-inline auto"]),
             Object(Matching, "libforest/osreport.c"),
             Object(Matching, "libforest/fault.c"),
             Object(Matching, "libforest/ReconfigBATs.c"),
diff --git a/tools/project.py b/tools/project.py
index 8c4a2d78..6dfb8a22 100644
--- a/tools/project.py
+++ b/tools/project.py
@@ -1322,6 +1322,7 @@ def generate_objdiff_config(
             "*.txt",
             "*.json",
             "*.c_inc",
+            "*.cc",
         ],
         "units": [],
         "progress_categories": [],