diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h
index 4732e263d8..2a1e7315b5 100644
--- a/core/io/file_access_pack.h
+++ b/core/io/file_access_pack.h
@@ -36,6 +36,7 @@
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 #include "core/print_string.h"
+#include "core/set.h"
 
 // Godot's packed file magic header ("GDPC" in ASCII).
 #define PACK_HEADER_MAGIC 0x43504447
diff --git a/core/map.h b/core/map.h
index 932edd171b..96e25c8a74 100644
--- a/core/map.h
+++ b/core/map.h
@@ -32,7 +32,7 @@
 #define MAP_H
 
 #include "core/error_macros.h"
-#include "core/set.h"
+#include "core/os/memory.h"
 
 // based on the very nice implementation of rb-trees by:
 // https://web.archive.org/web/20120507164830/http://web.mit.edu/~emin/www/source_code/red_black_tree/index.html