diff --git a/panda/src/downloader/downloader_headers.h b/panda/src/downloader/downloader_headers.h
index f4fa338349..e9d2ea0221 100644
--- a/panda/src/downloader/downloader_headers.h
+++ b/panda/src/downloader/downloader_headers.h
@@ -35,5 +35,6 @@
 #include <throw_event.h>
 
 #include "config_downloader.h"
+#include "download_utils.h"
 #pragma hdrstop
 
diff --git a/panda/src/express/memoryUsage.h b/panda/src/express/memoryUsage.h
index cc11bd4569..913278d0a2 100644
--- a/panda/src/express/memoryUsage.h
+++ b/panda/src/express/memoryUsage.h
@@ -125,7 +125,7 @@ private:
   static MemoryUsage *_global_ptr;
 
   // Cannot use a pmap, since that would be recursive!
-  typedef map<void *, MemoryInfo> Table;
+  typedef pmap<void *, MemoryInfo> Table;
   Table _table;
   int _freeze_index;
   int _count;
@@ -140,7 +140,7 @@ private:
 
   private:
     // Cannot use a pmap, since that would be recursive!
-    typedef map<TypeHandle, MemoryUsagePointerCounts> Counts;
+    typedef pmap<TypeHandle, MemoryUsagePointerCounts> Counts;
     Counts _counts;
   };
   TypeHistogram _trend_types;