diff --git a/src/tools/texture_hasher/texture_hasher.cpp b/src/tools/texture_hasher/texture_hasher.cpp
index 0a51b99..235f281 100644
--- a/src/tools/texture_hasher/texture_hasher.cpp
+++ b/src/tools/texture_hasher/texture_hasher.cpp
@@ -4,6 +4,7 @@
 
 #include <filesystem>
 #include <fstream>
+#include <list>
 
 #include "../../contrib/xxHash/xxh3.h"
 #include "../../common/rt64_load_types.cpp"
@@ -345,7 +346,7 @@ void addRiceHash(const std::filesystem::path &directory, const std::string &hash
     // Rice expects to hash at least this many bytes, even if it leaks into other parts of RAM.
     uint32_t expectedSize = (height - 1) * bpl + (width << drawTile.siz >> 1);
     if (expectedSize > rdramBytes.size()) {
-        fprintf(stderr, "Unable to hash %s. Expected %d bytes but got %llu bytes (%dX%d).\n", hashNameWithSuffix.c_str(), expectedSize, rdramBytes.size(), width, height);
+        fprintf(stderr, "Unable to hash %s. Expected %d bytes but got %zu bytes (%dX%d).\n", hashNameWithSuffix.c_str(), expectedSize, rdramBytes.size(), width, height);
         return;
     }
 
@@ -615,4 +616,4 @@ int main(int argc, char *argv[]) {
     }
     
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/tools/texture_packer/texture_packer.cpp b/src/tools/texture_packer/texture_packer.cpp
index 02fe015..ed14516 100644
--- a/src/tools/texture_packer/texture_packer.cpp
+++ b/src/tools/texture_packer/texture_packer.cpp
@@ -2,11 +2,16 @@
 // RT64
 //
 
+#include <atomic>
+#include <condition_variable>
 #include <filesystem>
 #include <fstream>
+#include <list>
+#include <memory>
 #include <mutex>
 #include <queue>
 #include <set>
+#include <thread>
 
 #include <ddspp/ddspp.h>
 #include <miniz/miniz.h>
@@ -530,4 +535,4 @@ int main(int argc, char *argv[]) {
     }
 
     return 0;
-}
\ No newline at end of file
+}