diff --git a/driver/main.cpp b/driver/main.cpp
index 23e009b..cd13144 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -1,7 +1,14 @@
+#include <cstddef>
+#include <cstdint>
 #include <cstdio>
 #include <cstring>
-#include "logvisor/logvisor.hpp"
-#include "nod/nod.hpp"
+
+#include <logvisor/logvisor.hpp>
+
+#include <nod/DiscBase.hpp>
+#include <nod/DiscGCN.hpp>
+#include <nod/DiscWii.hpp>
+#include <nod/nod.hpp>
 
 static void printHelp() {
   fmt::print(stderr, fmt(
diff --git a/include/nod/DirectoryEnumerator.hpp b/include/nod/DirectoryEnumerator.hpp
index bdba4ba..107bbfe 100644
--- a/include/nod/DirectoryEnumerator.hpp
+++ b/include/nod/DirectoryEnumerator.hpp
@@ -1,6 +1,11 @@
 #pragma once
 
-#include "Util.hpp"
+#include <algorithm>
+#include <cctype>
+#include <cstddef>
+#include <vector>
+
+#include "nod/Util.hpp"
 
 namespace nod {
 
diff --git a/include/nod/DiscBase.hpp b/include/nod/DiscBase.hpp
index 5bae1eb..ef791d0 100644
--- a/include/nod/DiscBase.hpp
+++ b/include/nod/DiscBase.hpp
@@ -1,15 +1,17 @@
 #pragma once
 
-#include <vector>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <functional>
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <cstdio>
-#include <cstdint>
-#include <functional>
-#include "Util.hpp"
-#include "IDiscIO.hpp"
-#include "IFileIO.hpp"
+#include <vector>
+
+#include "nod/IDiscIO.hpp"
+#include "nod/IFileIO.hpp"
+#include "nod/Util.hpp"
 
 namespace nod {
 
diff --git a/include/nod/DiscGCN.hpp b/include/nod/DiscGCN.hpp
index 21c6a63..040070c 100644
--- a/include/nod/DiscGCN.hpp
+++ b/include/nod/DiscGCN.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DiscBase.hpp"
+#include "nod/DiscBase.hpp"
 
 namespace nod {
 class DiscBuilderGCN;
diff --git a/include/nod/DiscWii.hpp b/include/nod/DiscWii.hpp
index bc39bad..8ef8d5a 100644
--- a/include/nod/DiscWii.hpp
+++ b/include/nod/DiscWii.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DiscBase.hpp"
+#include "nod/DiscBase.hpp"
 
 namespace nod {
 class DiscBuilderWii;
diff --git a/include/nod/IDiscIO.hpp b/include/nod/IDiscIO.hpp
index 3383fa8..732f567 100644
--- a/include/nod/IDiscIO.hpp
+++ b/include/nod/IDiscIO.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include <memory>
-#include <cstdlib>
-#include <cstdio>
 #include <cstdint>
+#include <cstdio>
+#include <memory>
 
 #if NOD_ATHENA
 #include <athena/IStreamReader.hpp>
diff --git a/include/nod/IFileIO.hpp b/include/nod/IFileIO.hpp
index 3f4c689..075a980 100644
--- a/include/nod/IFileIO.hpp
+++ b/include/nod/IFileIO.hpp
@@ -1,10 +1,13 @@
 #pragma once
 
-#include <memory>
+#include <cstdint>
 #include <functional>
-#include <cstdlib>
-#include "IDiscIO.hpp"
-#include "Util.hpp"
+#include <memory>
+
+#include "nod/IDiscIO.hpp"
+#include "nod/Util.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace nod {
 
diff --git a/include/nod/Util.hpp b/include/nod/Util.hpp
index 16519a0..490f2b4 100644
--- a/include/nod/Util.hpp
+++ b/include/nod/Util.hpp
@@ -29,7 +29,7 @@
 #include <cstring>
 #include <string>
 #include <string_view>
-#include "logvisor/logvisor.hpp"
+#include <logvisor/logvisor.hpp>
 #ifdef _MSC_VER
 #pragma warning(disable : 4996)
 
diff --git a/include/nod/nod.hpp b/include/nod/nod.hpp
index 6042f34..758c44a 100644
--- a/include/nod/nod.hpp
+++ b/include/nod/nod.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <memory>
 #include <functional>
-#include "logvisor/logvisor.hpp"
-#include "Util.hpp"
+#include <memory>
+#include <string>
+
+#include "nod/Util.hpp"
 
 namespace nod {
 
@@ -18,7 +19,3 @@ std::unique_ptr<DiscBase> OpenDiscFromImage(SystemStringView path);
 std::unique_ptr<DiscBase> OpenDiscFromImage(SystemStringView path, bool& isWii);
 
 } // namespace nod
-
-#include "DiscGCN.hpp"
-#include "DiscWii.hpp"
-#include "IDiscIO.hpp"
diff --git a/lib/DirectoryEnumerator.cpp b/lib/DirectoryEnumerator.cpp
index 4abd9b3..e077789 100644
--- a/lib/DirectoryEnumerator.cpp
+++ b/lib/DirectoryEnumerator.cpp
@@ -1,3 +1,5 @@
+#include "nod/DirectoryEnumerator.hpp"
+
 #ifdef _WIN32
 #include <windows.h>
 #else
@@ -5,10 +7,9 @@
 #include <dirent.h>
 #endif
 
+#include <cstring>
 #include <map>
 
-#include "nod/DirectoryEnumerator.hpp"
-
 namespace nod {
 
 DirectoryEnumerator::DirectoryEnumerator(SystemStringView path, Mode mode, bool sizeSort, bool reverse, bool noHidden) {
diff --git a/lib/DiscBase.cpp b/lib/DiscBase.cpp
index 899ddd3..37c4925 100644
--- a/lib/DiscBase.cpp
+++ b/lib/DiscBase.cpp
@@ -1,14 +1,22 @@
 #include "nod/DiscBase.hpp"
-#include "nod/IFileIO.hpp"
-#include "nod/DirectoryEnumerator.hpp"
-#include "nod/nod.hpp"
 
-#include <cstdio>
 #include <cerrno>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <unordered_map>
+
+#include "nod/DirectoryEnumerator.hpp"
+#include "nod/IFileIO.hpp"
+#include "nod/nod.hpp"
+#include "nod/Util.hpp"
 
 #ifndef _WIN32
 #include <unistd.h>
 #else
+
+#include <logvisor/logvisor.hpp>
+
 static void* memmem(const void* haystack, size_t hlen, const void* needle, size_t nlen) {
   int needle_first;
   const uint8_t* p = static_cast<const uint8_t*>(haystack);
diff --git a/lib/DiscGCN.cpp b/lib/DiscGCN.cpp
index 81e41f0..5b78c70 100644
--- a/lib/DiscGCN.cpp
+++ b/lib/DiscGCN.cpp
@@ -1,6 +1,16 @@
 #include "nod/DiscGCN.hpp"
-#include "nod/nod.hpp"
+
 #include <cinttypes>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <string>
+
+#include "nod/nod.hpp"
+#include "nod/Util.hpp"
+
+#include <logvisor/logvisor.hpp>
+
 #define BUFFER_SZ 0x8000
 
 namespace nod {
diff --git a/lib/DiscIOISO.cpp b/lib/DiscIOISO.cpp
index 678cf38..3e2cd06 100644
--- a/lib/DiscIOISO.cpp
+++ b/lib/DiscIOISO.cpp
@@ -1,7 +1,6 @@
-#include <cstdio>
-#include "nod/Util.hpp"
 #include "nod/IDiscIO.hpp"
 #include "nod/IFileIO.hpp"
+#include "nod/Util.hpp"
 
 namespace nod {
 
diff --git a/lib/DiscIOWBFS.cpp b/lib/DiscIOWBFS.cpp
index cdd3517..70608df 100644
--- a/lib/DiscIOWBFS.cpp
+++ b/lib/DiscIOWBFS.cpp
@@ -1,8 +1,13 @@
-#include <cstdio>
 #include <cinttypes>
-#include "nod/Util.hpp"
+#include <cstdint>
+#include <cstring>
+#include <memory>
+
 #include "nod/IDiscIO.hpp"
 #include "nod/IFileIO.hpp"
+#include "nod/Util.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace nod {
 
diff --git a/lib/DiscWii.cpp b/lib/DiscWii.cpp
index c81bd34..416ecde 100644
--- a/lib/DiscWii.cpp
+++ b/lib/DiscWii.cpp
@@ -1,11 +1,15 @@
-#include <cstdio>
-#include <cstring>
-#include <cstdlib>
-#include <cinttypes>
 #include "nod/DiscWii.hpp"
+
+#include <cinttypes>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
 #include "nod/aes.hpp"
-#include "nod/sha1.h"
 #include "nod/nod.hpp"
+#include "nod/sha1.h"
+#include "nod/Util.hpp"
 
 namespace nod {
 
diff --git a/lib/FileIOFILE.cpp b/lib/FileIOFILE.cpp
index e2d08bb..24a8c04 100644
--- a/lib/FileIOFILE.cpp
+++ b/lib/FileIOFILE.cpp
@@ -1,8 +1,12 @@
-#include <cstdio>
-#include <cstdlib>
 #include <cinttypes>
-#include "nod/Util.hpp"
+#include <cstdio>
+#include <cstdint>
+#include <cstdlib>
+
 #include "nod/IFileIO.hpp"
+#include "nod/Util.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace nod {
 
diff --git a/lib/FileIOWin32.cpp b/lib/FileIOWin32.cpp
index a6d799d..d343018 100644
--- a/lib/FileIOWin32.cpp
+++ b/lib/FileIOWin32.cpp
@@ -1,8 +1,12 @@
+#include <cinttypes>
+#include <cstdint>
 #include <cstdio>
 #include <cstdlib>
-#include <cinttypes>
-#include "nod/Util.hpp"
+
 #include "nod/IFileIO.hpp"
+#include "nod/Util.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace nod {
 
diff --git a/lib/nod.cpp b/lib/nod.cpp
index a57b7d4..bbfcb6b 100644
--- a/lib/nod.cpp
+++ b/lib/nod.cpp
@@ -1,6 +1,10 @@
-#include <cstdio>
 #include "nod/nod.hpp"
+
+#include <cstdio>
+
 #include "nod/DiscBase.hpp"
+#include "nod/DiscGCN.hpp"
+#include "nod/DiscWii.hpp"
 
 namespace nod {