diff --git a/include/internal.h b/include/internal.h
index c9fd662..c89a743 100644
--- a/include/internal.h
+++ b/include/internal.h
@@ -22,9 +22,12 @@
 /** @brief Clamp num_threads to LZMA's valid range [1, 2]. */
 #define LZMA_THREADS(ctx) ((ctx)->num_threads > 1 ? 2 : 1)
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 
+#include "aaruformat/context.h"
+
 #if defined(AARU_USE_WIN32_FILEIO64)
 #define AARU_FSEEK _fseeki64
 #define AARU_FTELL _ftelli64
diff --git a/tests/ps3_ird.cpp b/tests/ps3_ird.cpp
index 253c768..70fb38c 100644
--- a/tests/ps3_ird.cpp
+++ b/tests/ps3_ird.cpp
@@ -10,6 +10,7 @@
 #include <cstdio>
 #include <cstring>
 
+#include "decls.h"
 #include "gtest/gtest.h"
 
 extern "C"
diff --git a/tests/ps3_iso9660.cpp b/tests/ps3_iso9660.cpp
index 8a547ba..87e713d 100644
--- a/tests/ps3_iso9660.cpp
+++ b/tests/ps3_iso9660.cpp
@@ -11,6 +11,7 @@
 #include <cstdlib>
 #include <cstring>
 
+#include "decls.h"
 #include "gtest/gtest.h"
 
 extern "C"
diff --git a/tests/ps3_sfo.cpp b/tests/ps3_sfo.cpp
index 6150229..d0b41d1 100644
--- a/tests/ps3_sfo.cpp
+++ b/tests/ps3_sfo.cpp
@@ -11,6 +11,7 @@
 #include <cstdlib>
 #include <cstring>
 
+#include "decls.h"
 #include "gtest/gtest.h"
 
 extern "C"
diff --git a/tests/sha1.cpp b/tests/sha1.cpp
index 0d7efc3..3d6fde4 100644
--- a/tests/sha1.cpp
+++ b/tests/sha1.cpp
@@ -1,7 +1,11 @@
 // SHA-1 tests (public domain / MIT implementation integration)
 // Uses standard FIPS 180-1 test vectors.
 
+#if defined(_WIN32)
+#include <direct.h>
+#else
 #include <unistd.h>
+#endif
 #include <climits>
 #include <cstdint>
 #include <cstdio>
diff --git a/tests/sha256.cpp b/tests/sha256.cpp
index e714482..cb20627 100644
--- a/tests/sha256.cpp
+++ b/tests/sha256.cpp
@@ -6,7 +6,11 @@
  * Validates implementation against standard FIPS 180-4 test vectors and the bundled random file.
  */
 
+#if defined(_WIN32)
+#include <direct.h>
+#else
 #include <unistd.h>
+#endif
 #include <climits>
 #include <cstdint>
 #include <cstdio>