diff --git a/cmake/AISCompilerOptions.cmake b/cmake/AISCompilerOptions.cmake
index a2e1dfa6..e5b2a02b 100644
--- a/cmake/AISCompilerOptions.cmake
+++ b/cmake/AISCompilerOptions.cmake
@@ -19,10 +19,16 @@ function (ais_set_compiler_flags target)
         endif()
         set(compiler_id "${CMAKE_${language}_COMPILER_ID}")
         set(compiler_version "${CMAKE_${language}_COMPILER_VERSION}")
-        if(compiler_id STREQUAL "GNU" OR compiler_id STREQUAL "NVIDIA")
-            get_ais_gnu_warning_flags(compiler_flags compiler_version)
-        elseif(compiler_id STREQUAL "Clang")
-            get_ais_clang_warning_flags(compiler_flags compiler_version)
+
+        # Only use default flags with include-what-you-use. Otherwise you'll
+        # clutter the output with a lot of "unrecognized flags" warnings if
+        # there's mismatch between IWYU's clang and the compiler you are using.
+        if(NOT AIS_USE_IWYU)
+            if(compiler_id STREQUAL "GNU" OR compiler_id STREQUAL "NVIDIA")
+                get_ais_gnu_warning_flags(compiler_flags compiler_version)
+            elseif(compiler_id STREQUAL "Clang")
+                get_ais_clang_warning_flags(compiler_flags compiler_version)
+            endif()
         endif()
         target_compile_options(${target} PRIVATE $<$<COMPILE_LANG_AND_ID:${language},${compiler_id}>:${compiler_flags}>)
         if(BUILD_CODE_COVERAGE)
diff --git a/hipfile/examples/aiscp/aiscp.cpp b/hipfile/examples/aiscp/aiscp.cpp
index 5d51dddf..14e1715a 100644
--- a/hipfile/examples/aiscp/aiscp.cpp
+++ b/hipfile/examples/aiscp/aiscp.cpp
@@ -12,13 +12,16 @@
  * Note: Currently SOURCE's size must be > 0 and a multiple of 4096.
  */
 
-#include <hip/hip_runtime.h>
 #include <hipfile.h>
+#include <hip/hip_runtime_api.h>
 
 #include <cerrno>
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 /// @brief Open and register a file
diff --git a/hipfile/include/hipfile.h b/hipfile/include/hipfile.h
index eecc5cbb..c9705ed7 100644
--- a/hipfile/include/hipfile.h
+++ b/hipfile/include/hipfile.h
@@ -5,16 +5,13 @@
 
 #pragma once
 
+#include <hipfile-types.h>
 #include <hip/hip_runtime_api.h>
-
-#include <sys/socket.h>
-#include <sys/types.h>
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-
-#include <hipfile-types.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
 #if defined(__GNUC__)
 #define HIPFILE_API __attribute__((visibility("default")))
diff --git a/hipfile/src/amd_detail/hipfile.cpp b/hipfile/src/amd_detail/hipfile.cpp
index 74d58db9..ef50f3c2 100644
--- a/hipfile/src/amd_detail/hipfile.cpp
+++ b/hipfile/src/amd_detail/hipfile.cpp
@@ -4,17 +4,16 @@
  */
 
 #include "hipfile-rocfile.h"
+#include "hipfile-types.h"
 #include "hipfile.h"
-
 #include "rocfile.h"
 
-#include <hip/hip_runtime_api.h>
-
-#include <sys/types.h>
-
 #include <cerrno>
+#include <climits>
+#include <cstdint>
 #include <cstdlib>
-#include <limits>
+#include <hip/hip_runtime_api.h>
+#include <sys/types.h>
 #include <vector>
 
 using namespace std;
diff --git a/hipfile/src/common/hipfile-common.cpp b/hipfile/src/common/hipfile-common.cpp
index f1329dbb..3d67c8d9 100644
--- a/hipfile/src/common/hipfile-common.cpp
+++ b/hipfile/src/common/hipfile-common.cpp
@@ -5,6 +5,8 @@
 
 #include "hipfile.h"
 
+#include <hip/hip_runtime_api.h>
+
 const char *
 hipFileOpStatusError(hipFileOpError_t status)
 {
diff --git a/hipfile/test/hipfile-rocfile.cpp b/hipfile/test/hipfile-rocfile.cpp
index be7d8ab3..78a46f68 100644
--- a/hipfile/test/hipfile-rocfile.cpp
+++ b/hipfile/test/hipfile-rocfile.cpp
@@ -5,12 +5,15 @@
 
 #include "hipfile.h"
 #include "hipfile-rocfile.h"
-#include "test-common.h"
-
 #include "hipfile-warnings.h"
 #include "invalid-enum.h"
+#include "rocfile.h"
+#include "test-common.h"
 
 #include <gtest/gtest.h>
+#include <hip/hip_runtime_api.h>
+#include <memory>
+#include <stdexcept>
 
 // Put tests inside the macros to suppress the global constructor
 // warnings
diff --git a/hipfile/test/main.cpp b/hipfile/test/main.cpp
index 9b646b6e..1c8b8000 100644
--- a/hipfile/test/main.cpp
+++ b/hipfile/test/main.cpp
@@ -3,15 +3,11 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "test-common.h"
-
 #include "hipfile-warnings.h"
 #include "invalid-enum.h"
 
 #include <gtest/gtest.h>
-#include <hip/hip_runtime.h>
-
-#include <ctime>
+#include <memory>
 
 using namespace std;
 
diff --git a/hipfile/test/system/buffer.cpp b/hipfile/test/system/buffer.cpp
index e41504b4..7e3c1007 100644
--- a/hipfile/test/system/buffer.cpp
+++ b/hipfile/test/system/buffer.cpp
@@ -8,9 +8,10 @@
 #include "test-common.h"
 #include "test-shared-fixtures.h"
 
+#include <cstdint>
 #include <gtest/gtest.h>
 #include <hip/hip_runtime_api.h>
-#include <stdint.h>
+#include <memory>
 
 HIPFILE_WARN_NO_GLOBAL_CTOR_OFF
 
diff --git a/hipfile/test/system/version.cpp b/hipfile/test/system/version.cpp
index bfc6c215..dc4d1f74 100644
--- a/hipfile/test/system/version.cpp
+++ b/hipfile/test/system/version.cpp
@@ -7,7 +7,9 @@
 #include "hipfile-warnings.h"
 #include "test-common.h"
 
+#include <climits>
 #include <gtest/gtest.h>
+#include <memory>
 
 HIPFILE_WARN_NO_GLOBAL_CTOR_OFF
 
diff --git a/hipfile/test/test-hipfile-batch.cpp b/hipfile/test/test-hipfile-batch.cpp
index 7ae772a5..221afe9d 100644
--- a/hipfile/test/test-hipfile-batch.cpp
+++ b/hipfile/test/test-hipfile-batch.cpp
@@ -13,15 +13,16 @@
 
 #include "hipfile-warnings.h"
 
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 
 #include <cerrno>
 #include <cstdarg>
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #define MAX_BATCH_IO_OPS 16
 #define MAX_BUFFER_SIZE  4096
diff --git a/hipfile/test/test-hipfile.cpp b/hipfile/test/test-hipfile.cpp
index b73e26dd..114d9ba8 100644
--- a/hipfile/test/test-hipfile.cpp
+++ b/hipfile/test/test-hipfile.cpp
@@ -11,15 +11,16 @@
 
 #include "hipfile.h"
 
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 
 #include <cerrno>
 #include <cinttypes>
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 void static print_drv_props(hipFileDriverProps_t hipfile_props)
 {
diff --git a/rocfile/include/rocfile.h b/rocfile/include/rocfile.h
index afd0e02c..424d33be 100644
--- a/rocfile/include/rocfile.h
+++ b/rocfile/include/rocfile.h
@@ -5,16 +5,12 @@
 
 #pragma once
 
+#include <hipfile-types.h>
 #include <hip/hip_runtime_api.h>
-
-#include <sys/socket.h>
-#include <sys/types.h>
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-
-#include <hipfile-types.h>
+#include <sys/types.h>
 
 #if defined(__GNUC__)
 #define ROCFILE_API __attribute__((visibility("default")))
diff --git a/rocfile/src/async.cpp b/rocfile/src/async.cpp
index 6ab3dfde..adab7a70 100644
--- a/rocfile/src/async.cpp
+++ b/rocfile/src/async.cpp
@@ -5,10 +5,23 @@
 
 #include "async.h"
 #include "context.h"
+#include "stream.h"
 #include "sys.h"
 
 #include <memory>
+#include <stdexcept>
 #include <syslog.h>
+#include <utility>
+
+namespace rocFile {
+class IBuffer;
+}
+namespace rocFile {
+class IFile;
+}
+namespace rocFile {
+enum class IoType;
+}
 
 namespace rocFile {
 
diff --git a/rocfile/src/async.h b/rocfile/src/async.h
index 614c3813..fe5e8ea2 100644
--- a/rocfile/src/async.h
+++ b/rocfile/src/async.h
@@ -4,10 +4,7 @@
  */
 #pragma once
 
-#include "buffer.h"
-#include "file.h"
-#include "io.h"
-#include "stream.h"
+#include "hipfile-types.h"
 
 #include <condition_variable>
 #include <memory>
@@ -18,6 +15,19 @@
 #include <variant>
 #include <vector>
 
+namespace rocFile {
+class IBuffer;
+}
+namespace rocFile {
+class IFile;
+}
+namespace rocFile {
+class IStream;
+}
+namespace rocFile {
+enum class IoType;
+}
+
 namespace rocFile {
 
 class AsyncOp {
diff --git a/rocfile/src/backend/asyncop-fallback.cpp b/rocfile/src/backend/asyncop-fallback.cpp
index 486ea6b2..cd951d3c 100644
--- a/rocfile/src/backend/asyncop-fallback.cpp
+++ b/rocfile/src/backend/asyncop-fallback.cpp
@@ -3,12 +3,26 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "async.h"
 #include "asyncop-fallback.h"
+#include "buffer.h"
 #include "context.h"
+#include "hip.h"
 #include "sys.h"
 
-#include <syslog.h>
 #include <memory>
+#include <new>
+#include <syslog.h>
+
+namespace rocFile {
+class IFile;
+}
+namespace rocFile {
+class IStream;
+}
+namespace rocFile {
+enum class IoType;
+}
 
 using namespace rocFile;
 
diff --git a/rocfile/src/backend/asyncop-fallback.h b/rocfile/src/backend/asyncop-fallback.h
index 190063a0..cb44766e 100644
--- a/rocfile/src/backend/asyncop-fallback.h
+++ b/rocfile/src/backend/asyncop-fallback.h
@@ -5,6 +5,23 @@
 #pragma once
 
 #include "async.h"
+#include "hipfile-types.h"
+
+#include <memory>
+#include <sys/types.h>
+
+namespace rocFile {
+class IBuffer;
+}
+namespace rocFile {
+class IFile;
+}
+namespace rocFile {
+class IStream;
+}
+namespace rocFile {
+enum class IoType;
+}
 
 namespace rocFile {
 
diff --git a/rocfile/src/backend/fallback.cpp b/rocfile/src/backend/fallback.cpp
index 20665e48..e0894bf0 100644
--- a/rocfile/src/backend/fallback.cpp
+++ b/rocfile/src/backend/fallback.cpp
@@ -3,11 +3,21 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "backend.h"
+#include "buffer.h"
 #include "context.h"
 #include "fallback.h"
-#include "rocfile.h"
+#include "file.h"
+#include "hip.h"
+#include "io.h"
+#include "sys.h"
 
-#include <limits>
+#include <algorithm>
+#include <cerrno>
+#include <cstdint>
+#include <hip/hip_runtime_api.h>
+#include <hip/driver_types.h>
+#include <stdexcept>
 #include <sys/mman.h>
 
 using namespace rocFile;
diff --git a/rocfile/src/backend/fallback.h b/rocfile/src/backend/fallback.h
index 5156cb61..94bd75b9 100644
--- a/rocfile/src/backend/fallback.h
+++ b/rocfile/src/backend/fallback.h
@@ -6,8 +6,20 @@
 #pragma once
 
 #include "backend.h"
-#include "file.h"
-#include "io.h"
+#include "hipfile-types.h"
+
+#include <memory>
+#include <sys/types.h>
+
+namespace rocFile {
+class IBuffer;
+}
+namespace rocFile {
+class IFile;
+}
+namespace rocFile {
+enum class IoType;
+}
 
 namespace rocFile {
 
diff --git a/rocfile/src/batch/batch.cpp b/rocfile/src/batch/batch.cpp
index 3f92eb74..024ca359 100644
--- a/rocfile/src/batch/batch.cpp
+++ b/rocfile/src/batch/batch.cpp
@@ -4,18 +4,20 @@
  */
 
 #include "batch.h"
+#include "buffer.h"
 #include "context.h"
 #include "file.h"
-#include "state.h"
-
-#include "hipfile-warnings.h"
 #include "rocfile.h"
+#include "state.h"
 
+#include <cstddef>
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
 #include <sstream>
+#include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 namespace rocFile {
diff --git a/rocfile/src/batch/batch.h b/rocfile/src/batch/batch.h
index 22dfd0e8..0d4cb31d 100644
--- a/rocfile/src/batch/batch.h
+++ b/rocfile/src/batch/batch.h
@@ -5,17 +5,21 @@
 
 #pragma once
 
-#include "buffer.h"
-#include "file.h"
 #include "rocfile.h"
 
 #include <memory>
-#include <mutex>
 #include <shared_mutex>
 #include <stdexcept>
 #include <unordered_map>
 #include <unordered_set>
 
+namespace rocFile {
+class IBuffer;
+}
+namespace rocFile {
+class IFile;
+}
+
 namespace rocFile {
 
 struct InvalidBatchHandle : public std::invalid_argument {
diff --git a/rocfile/src/buffer.cpp b/rocfile/src/buffer.cpp
index 81d15cce..efef86df 100644
--- a/rocfile/src/buffer.cpp
+++ b/rocfile/src/buffer.cpp
@@ -6,14 +6,12 @@
 #include "buffer.h"
 #include "context.h"
 #include "hip.h"
-#include "state.h"
-
-#include <cstdint>
-#include <hip/hip_runtime_api.h>
 
 #include <algorithm>
+#include <cstdint>
 #include <cstdlib>
-#include <mutex>
+#include <hip/hip_runtime_api.h>
+#include <iterator>
 #include <stdexcept>
 #include <utility>
 #include <vector>
diff --git a/rocfile/src/buffer.h b/rocfile/src/buffer.h
index 8668f4c8..d20878f5 100644
--- a/rocfile/src/buffer.h
+++ b/rocfile/src/buffer.h
@@ -5,11 +5,9 @@
 
 #pragma once
 
-#include "hip.h"
-
 #include <cstddef>
+#include <hip/hip_runtime_api.h>
 #include <memory>
-#include <shared_mutex>
 #include <stdexcept>
 #include <unordered_map>
 
diff --git a/rocfile/src/file.cpp b/rocfile/src/file.cpp
index 01d8d42e..eec07bd6 100644
--- a/rocfile/src/file.cpp
+++ b/rocfile/src/file.cpp
@@ -5,12 +5,14 @@
 
 #include "context.h"
 #include "file.h"
-#include "state.h"
+#include "mountinfo.h"
 #include "sys.h"
 
 #include <algorithm>
 #include <cstdlib>
-#include <mutex>
+#include <fcntl.h>
+#include <iterator>
+#include <utility>
 #include <vector>
 
 using std::optional;
diff --git a/rocfile/src/file.h b/rocfile/src/file.h
index 0b5dff6b..996157a3 100644
--- a/rocfile/src/file.h
+++ b/rocfile/src/file.h
@@ -10,9 +10,9 @@
 
 #include <memory>
 #include <optional>
-#include <shared_mutex>
 #include <stdexcept>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unordered_map>
 
 namespace rocFile {
diff --git a/rocfile/src/hip.cpp b/rocfile/src/hip.cpp
index 8f1a2cab..b575842a 100644
--- a/rocfile/src/hip.cpp
+++ b/rocfile/src/hip.cpp
@@ -3,9 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "hip.h"
-#include "io.h"
 #include "context.h"
+#include "hip.h"
 
 #include <cstdlib>
 #include <system_error>
diff --git a/rocfile/src/hip.h b/rocfile/src/hip.h
index dbfa1ea5..754801f2 100644
--- a/rocfile/src/hip.h
+++ b/rocfile/src/hip.h
@@ -5,9 +5,12 @@
 
 #pragma once
 
+#include <cstddef>
+#include <cstdint>
 #include <hip/hip_runtime_api.h>
-
+#include <hip/driver_types.h>
 #include <stdexcept>
+#include <string>
 
 /* hipxx (hip++)
  *
diff --git a/rocfile/src/mountinfo.cpp b/rocfile/src/mountinfo.cpp
index 769fd65a..1fb3a143 100644
--- a/rocfile/src/mountinfo.cpp
+++ b/rocfile/src/mountinfo.cpp
@@ -7,8 +7,13 @@
 #include "mountinfo.h"
 
 #include <cstring>
+#include <libmount/libmount.h>
 #include <stdexcept>
 
+struct libmnt_context;
+struct libmnt_fs;
+struct libmnt_table;
+
 namespace rocFile {
 
 LibMount::~LibMount()
diff --git a/rocfile/src/mountinfo.h b/rocfile/src/mountinfo.h
index d0db6a2f..ccd48c6e 100644
--- a/rocfile/src/mountinfo.h
+++ b/rocfile/src/mountinfo.h
@@ -5,10 +5,13 @@
 
 #pragma once
 
-#include <libmount/libmount.h>
 #include <optional>
 #include <sys/types.h>
 
+struct libmnt_context;
+struct libmnt_fs;
+struct libmnt_table;
+
 namespace rocFile {
 
 /// @brief The filesystem type
diff --git a/rocfile/src/rocfile-private.h b/rocfile/src/rocfile-private.h
index eec48f1c..060887c7 100644
--- a/rocfile/src/rocfile-private.h
+++ b/rocfile/src/rocfile-private.h
@@ -5,9 +5,15 @@
 
 #pragma once
 
-#include "io.h"
+#include "hipfile-types.h"
 #include "rocfile.h"
 
+#include <sys/types.h>
+
+namespace rocFile {
+enum class IoType;
+}
+
 // NOTE: This is an internal API that we don't document, even though it's
 // "public" in the sense of being visible as a symbol in the deployed library
 
diff --git a/rocfile/src/rocfile.cpp b/rocfile/src/rocfile.cpp
index 307463a0..10f2b60d 100644
--- a/rocfile/src/rocfile.cpp
+++ b/rocfile/src/rocfile.cpp
@@ -3,21 +3,24 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "backend.h"
+#include "batch/batch.h"
 #include "buffer.h"
-#include "backend/fallback.h"
 #include "context.h"
 #include "file.h"
 #include "hip.h"
+#include "hipfile-types.h"
 #include "hipfile-warnings.h"
 #include "io.h"
 #include "rocfile.h"
 #include "rocfile-private.h"
 #include "state.h"
+#include "sys.h"
 
-#include <cassert>
-#include <mutex>
+#include <cerrno>
+#include <memory>
 #include <stdexcept>
-#include <shared_mutex>
+#include <vector>
 
 using namespace rocFile;
 
diff --git a/rocfile/src/state.cpp b/rocfile/src/state.cpp
index 0cf0ef53..f7806179 100644
--- a/rocfile/src/state.cpp
+++ b/rocfile/src/state.cpp
@@ -6,13 +6,10 @@
 #include "backend/fallback.h"
 #include "batch/batch.h"
 #include "buffer.h"
-#include "mountinfo.h"
+#include "file.h"
 #include "state.h"
-#include "sys.h"
+#include "stream.h"
 
-#include "hipfile-warnings.h"
-
-#include <fcntl.h>
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
@@ -23,6 +20,10 @@ using std::shared_mutex;
 using std::shared_ptr;
 using std::unique_lock;
 
+namespace rocFile {
+struct Backend;
+}
+
 namespace rocFile {
 
 DriverState::DriverState() : ref_count{0}, backends{std::shared_ptr<Backend>(new Fallback{})}
diff --git a/rocfile/src/state.h b/rocfile/src/state.h
index f939c39d..68e42141 100644
--- a/rocfile/src/state.h
+++ b/rocfile/src/state.h
@@ -8,14 +8,22 @@
 #include "backend.h"
 #include "batch/batch.h"
 #include "buffer.h"
-#include "context.h"
 #include "file.h"
+#include "rocfile.h"
 #include "stream.h"
 
+#include <cstddef>
+#include <cstdint>
+#include <hip/hip_runtime_api.h>
 #include <memory>
 #include <shared_mutex>
+#include <stdexcept>
 #include <vector>
 
+namespace rocFile {
+template <typename T> struct Context;
+}
+
 namespace rocFile {
 
 /// @brief The driver is not initialized
diff --git a/rocfile/src/stream.cpp b/rocfile/src/stream.cpp
index 13d24c80..e0e07841 100644
--- a/rocfile/src/stream.cpp
+++ b/rocfile/src/stream.cpp
@@ -8,9 +8,10 @@
 #include "sys.h"
 
 #include <hip/hip_runtime_api.h>
-#include <syslog.h>
-
 #include <memory>
+#include <syslog.h>
+#include <stdexcept>
+#include <utility>
 
 namespace rocFile {
 
diff --git a/rocfile/src/stream.h b/rocfile/src/stream.h
index 383b0ca1..073f940a 100644
--- a/rocfile/src/stream.h
+++ b/rocfile/src/stream.h
@@ -4,7 +4,8 @@
  */
 #pragma once
 
-#include "hip.h"
+#include <cstdint>
+#include <hip/hip_runtime_api.h>
 #include <memory>
 #include <unordered_map>
 
diff --git a/rocfile/src/sys.cpp b/rocfile/src/sys.cpp
index 21b80a0a..7cb46c7b 100644
--- a/rocfile/src/sys.cpp
+++ b/rocfile/src/sys.cpp
@@ -5,11 +5,10 @@
 
 #include "sys.h"
 
-#include <cstring>
 #include <fcntl.h>
-#include <libmount/libmount.h>
 #include <sys/mman.h>
 #include <syslog.h>
+#include <unistd.h>
 
 namespace rocFile {
 
diff --git a/rocfile/src/sys.h b/rocfile/src/sys.h
index ba275440..d21aa9a9 100644
--- a/rocfile/src/sys.h
+++ b/rocfile/src/sys.h
@@ -8,13 +8,10 @@
 #include <cerrno>
 #include <cstddef>
 #include <cstdint>
-#include <optional>
 #include <stdexcept>
 
-#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 /* sys wraps system APIs used by rocFile which enables unit tests to mock system calls.
  *
diff --git a/rocfile/test/async.cpp b/rocfile/test/async.cpp
index e5e85a57..fc887fdf 100644
--- a/rocfile/test/async.cpp
+++ b/rocfile/test/async.cpp
@@ -7,19 +7,26 @@
 #include "backend/asyncop-fallback.h"
 #include "hip.h"
 #include "hipfile-warnings.h"
+#include "io.h"
 #include "mbuffer.h"
 #include "mfile.h"
 #include "mhip.h"
 #include "mstream.h"
 #include "msys.h"
+#include "rocfile.h"
 
 #include <cstdint>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <gtest/gtest.h>
+#include <hip/hip_runtime_api.h>
 #include <memory>
+#include <new>
+#include <stdexcept>
+#include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <tuple>
+#include <utility>
 
 // Put tests inside the macros to suppress the global constructor
 // warnings
diff --git a/rocfile/test/batch/batch.cpp b/rocfile/test/batch/batch.cpp
index 1a0a1d66..c8a219e9 100644
--- a/rocfile/test/batch/batch.cpp
+++ b/rocfile/test/batch/batch.cpp
@@ -3,21 +3,24 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "mbuffer.h"
-#include "mfile.h"
-#include "mstate.h"
-#include "rocfile-test.h"
-
 #include "batch/batch.h"
-#include "context.h"
+#include "buffer.h"
+#include "file.h"
 #include "hipfile-warnings.h"
 #include "invalid-enum.h"
+#include "mbuffer.h"
+#include "mfile.h"
+#include "mstate.h"
 #include "rocfile.h"
+#include "rocfile-test.h"
 #include "state.h"
 
+#include <cstdio>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
-
-#include <limits>
+#include <memory>
+#include <stdexcept>
+#include <utility>
 
 using ::testing::_;
 using ::testing::DoDefault;
diff --git a/rocfile/test/batch/batch_mt.cpp b/rocfile/test/batch/batch_mt.cpp
index 2b944f0a..ba53d80e 100644
--- a/rocfile/test/batch/batch_mt.cpp
+++ b/rocfile/test/batch/batch_mt.cpp
@@ -9,7 +9,6 @@
 //
 
 #include "batch/batch.h"
-
 #include "rocfile.h"
 
 #include <array>
@@ -18,6 +17,7 @@
 #include <iostream>
 #include <mutex>
 #include <random>
+#include <string>
 #include <thread>
 #include <unistd.h>
 #include <utility>
diff --git a/rocfile/test/buffer.cpp b/rocfile/test/buffer.cpp
index 80a4d34d..a966e02d 100644
--- a/rocfile/test/buffer.cpp
+++ b/rocfile/test/buffer.cpp
@@ -3,24 +3,23 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "rocfile-test.h"
-
-#include "mhip.h"
-
 #include "buffer.h"
 #include "context.h"
 #include "hip.h"
+#include "hipfile-warnings.h"
+#include "mhip.h"
 #include "rocfile.h"
-#include "rocfile-private.h"
+#include "rocfile-test.h"
 #include "state.h"
 
-#include "hipfile-warnings.h"
-
+#include <array>
+#include <cstddef>
+#include <cstdint>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <hip/hip_runtime_api.h>
-
-#include <cstddef>
+#include <memory>
+#include <stdexcept>
 
 using namespace rocFile;
 
diff --git a/rocfile/test/context.cpp b/rocfile/test/context.cpp
index 75d449c1..01afb73c 100644
--- a/rocfile/test/context.cpp
+++ b/rocfile/test/context.cpp
@@ -6,7 +6,9 @@
 #include "context.h"
 #include "hip.h"
 #include "hipfile-warnings.h"
+
 #include <gtest/gtest.h>
+#include <memory>
 
 using namespace rocFile;
 
diff --git a/rocfile/test/driver.cpp b/rocfile/test/driver.cpp
index 15d49e0b..3ca76e47 100644
--- a/rocfile/test/driver.cpp
+++ b/rocfile/test/driver.cpp
@@ -3,20 +3,20 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "rocfile-test.h"
-
+#include "hipfile-warnings.h"
 #include "mhip.h"
 #include "mmountinfo.h"
 #include "msys.h"
-
 #include "rocfile.h"
-#include "rocfile-private.h"
-
-#include "hipfile-warnings.h"
-
-#include <gtest/gtest.h>
+#include "rocfile-test.h"
+#include "sys.h"
 
+#include <cerrno>
 #include <cstdint>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <hip/hip_runtime_api.h>
+#include <memory>
 
 using namespace rocFile;
 using namespace testing;
diff --git a/rocfile/test/handle.cpp b/rocfile/test/handle.cpp
index 2a2e9985..9cee9e76 100644
--- a/rocfile/test/handle.cpp
+++ b/rocfile/test/handle.cpp
@@ -3,21 +3,24 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "rocfile-test.h"
-
-#include "msys.h"
-#include "mmountinfo.h"
-
 #include "context.h"
 #include "file.h"
+#include "hipfile-warnings.h"
+#include "msys.h"
+#include "mmountinfo.h"
 #include "rocfile.h"
+#include "rocfile-test.h"
 #include "state.h"
+#include "sys.h"
 
-#include "hipfile-warnings.h"
-
-#include <gtest/gtest.h>
-
+#include <cerrno>
 #include <fcntl.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <memory>
+#include <optional>
+#include <stdexcept>
+#include <sys/stat.h>
 #include <sys/sysmacros.h>
 
 using namespace rocFile;
diff --git a/rocfile/test/hip.cpp b/rocfile/test/hip.cpp
index 93779cc7..597384dc 100644
--- a/rocfile/test/hip.cpp
+++ b/rocfile/test/hip.cpp
@@ -3,10 +3,13 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "hip.h"
+#include "hipfile-warnings.h"
 #include "mhip.h"
-#include "rocfile-test.h"
 
-#include "hip.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <hip/hip_runtime_api.h>
 
 using namespace rocFile;
 using namespace testing;
diff --git a/rocfile/test/io.cpp b/rocfile/test/io.cpp
index 32b66cc0..9d3cc82a 100644
--- a/rocfile/test/io.cpp
+++ b/rocfile/test/io.cpp
@@ -3,39 +3,42 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "rocfile-test.h"
-
-#include "mbackend.h"
-#include "mbuffer.h"
-#include "mfile.h"
-#include "mhip.h"
-#include "mstate.h"
-#include "msys.h"
-
 #include "backend.h"
 #include "backend/fallback.h"
 #include "buffer.h"
 #include "context.h"
 #include "file.h"
 #include "hip.h"
-#include "rocfile-private.h"
+#include "hipfile-types.h"
+#include "hipfile-warnings.h"
+#include "io.h"
+#include "mbackend.h"
+#include "mbuffer.h"
+#include "mfile.h"
+#include "mhip.h"
+#include "mstate.h"
+#include "msys.h"
 #include "rocfile.h"
+#include "rocfile-test.h"
 #include "state.h"
+#include "sys.h"
 
-#include "hipfile-warnings.h"
-
-#include <gtest/gtest.h>
-#include <hip/hip_runtime_api.h>
-
-#include <sys/mman.h>
-#include <sys/types.h>
-
+#include <array>
 #include <cassert>
-#include <cstddef>
+#include <cerrno>
+#include <climits>
+#include <cstdint>
+#include <cstring>
 #include <fcntl.h>
-#include <limits>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <hip/hip_runtime_api.h>
+#include <hip/driver_types.h>
 #include <memory>
 #include <stdexcept>
+#include <string>
+#include <sys/mman.h>
+#include <unistd.h>
 #include <vector>
 
 using namespace rocFile;
diff --git a/rocfile/test/misc.cpp b/rocfile/test/misc.cpp
index 43d322d1..4571e65e 100644
--- a/rocfile/test/misc.cpp
+++ b/rocfile/test/misc.cpp
@@ -3,15 +3,14 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "rocfile-test.h"
-
-#include "rocfile.h"
-
+#include "context.h"
 #include "hipfile-warnings.h"
+#include "rocfile.h"
+#include "rocfile-test.h"
 
+#include <climits>
 #include <gtest/gtest.h>
-
-#include <limits>
+#include <memory>
 
 using namespace rocFile;
 
diff --git a/rocfile/test/mountinfo.cpp b/rocfile/test/mountinfo.cpp
index 1acf1511..818ee171 100644
--- a/rocfile/test/mountinfo.cpp
+++ b/rocfile/test/mountinfo.cpp
@@ -7,8 +7,20 @@
 #include "mmountinfo.h"
 #include "mountinfo.h"
 
-#include <sys/sysmacros.h>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include <libmount/libmount.h>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <sys/sysmacros.h>
+#include <sys/types.h>
+#include <tuple>
+#include <utility>
+
+struct libmnt_context;
+struct libmnt_fs;
+struct libmnt_table;
 
 using namespace rocFile;
 using namespace testing;
diff --git a/rocfile/test/rocfile.cpp b/rocfile/test/rocfile.cpp
index 5289e5a8..27732ede 100644
--- a/rocfile/test/rocfile.cpp
+++ b/rocfile/test/rocfile.cpp
@@ -11,15 +11,18 @@
  * All tests in this file are expected to pass on a CPU-only node.
  */
 
-#include "mbatch.h"
-#include "mstate.h"
-#include "rocfile-test.h"
-
 #include "batch/batch.h"
 #include "hipfile-warnings.h"
+#include "mbatch.h"
+#include "mstate.h"
 #include "rocfile.h"
+#include "rocfile-test.h"
 
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include <hip/hip_runtime_api.h>
+#include <memory>
+#include <stdexcept>
 
 using namespace rocFile;
 
diff --git a/rocfile/test/state_mt.cpp b/rocfile/test/state_mt.cpp
index 98dce6ae..95f7d9f7 100644
--- a/rocfile/test/state_mt.cpp
+++ b/rocfile/test/state_mt.cpp
@@ -8,19 +8,19 @@
 // Just run the program. It takes no special arguments.
 
 #include "context.h"
-#include "state.h"
-
 #include "rocfile.h"
-
-#include <hip/hip_runtime.h>
+#include "state.h"
 
 #include <array>
 #include <atomic>
+#include <cerrno>
 #include <cstdlib>
 #include <cstring>
+#include <hip/hip_runtime_api.h>
 #include <iostream>
 #include <mutex>
 #include <random>
+#include <string>
 #include <thread>
 #include <unistd.h>
 #include <utility>
diff --git a/rocfile/test/stream.cpp b/rocfile/test/stream.cpp
index a009cda3..20bea404 100644
--- a/rocfile/test/stream.cpp
+++ b/rocfile/test/stream.cpp
@@ -8,13 +8,15 @@
 #include "msys.h"
 #include "rocfile.h"
 #include "rocfile-test.h"
-#include "state.h"
 #include "stream.h"
 
-#include <gmock/gmock-actions.h>
-#include <gmock/gmock-nice-strict.h>
+#include <algorithm>
+#include <cstdint>
 #include <gtest/gtest.h>
+#include <hip/hip_runtime_api.h>
 #include <memory>
+#include <stdexcept>
+#include <tuple>
 
 using namespace rocFile;
 
diff --git a/shared/hipfile-types.h b/shared/hipfile-types.h
index ea1fffec..9d7cf75b 100644
--- a/shared/hipfile-types.h
+++ b/shared/hipfile-types.h
@@ -4,6 +4,8 @@
  */
 #pragma once
 
+#include <sys/types.h>
+
 // ***********************************************************************
 //  PLATFORM-INDEPENDENT TYPES
 // ***********************************************************************
diff --git a/shared/test/magic-word.h b/shared/test/magic-word.h
index 2d6182a5..1532a2db 100644
--- a/shared/test/magic-word.h
+++ b/shared/test/magic-word.h
@@ -8,6 +8,7 @@
 #include <fstream>
 #include <iostream>
 #include <sstream>
+#include <string>
 #include <unistd.h>
 
 static const char *message = "Ah ah ah, you didn't say the magic word!\n"