diff --git a/makepanda/selfdestruct.py b/makepanda/selfdestruct.py
index 636f23dee5..79518a72d4 100755
--- a/makepanda/selfdestruct.py
+++ b/makepanda/selfdestruct.py
@@ -34,5 +34,5 @@ for project in projects:
     for path, dirs, files in os.walk(os.path.join(root, project)):
         # Get rid of _composite#.cxx files
         for filename in files:
-            if re.match(r'.*_composite[0-9]+\.cxx', filename):
+            if re.match(r'.*_composite[0-9]*\.(cxx|h|mm)', filename):
                 os.unlink(os.path.join(path, filename))