diff --git a/hipfile/include/hipfile.h b/hipfile/include/hipfile.h
index c9705ed7..a137e7f4 100644
--- a/hipfile/include/hipfile.h
+++ b/hipfile/include/hipfile.h
@@ -10,7 +10,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 
 #if defined(__GNUC__)
diff --git a/hipfile/src/nvidia_detail/hipfile-cufile.cpp b/hipfile/src/nvidia_detail/hipfile-cufile.cpp
index 1f4deecb..2d12284b 100644
--- a/hipfile/src/nvidia_detail/hipfile-cufile.cpp
+++ b/hipfile/src/nvidia_detail/hipfile-cufile.cpp
@@ -6,6 +6,8 @@
 #include "hipfile-cufile.h"
 
 #include <climits>
+#include <cuda.h>
+#include <hip/hip_runtime_api.h>
 #include <stdexcept>
 
 hipFileOpError_t
diff --git a/hipfile/src/nvidia_detail/hipfile.cpp b/hipfile/src/nvidia_detail/hipfile.cpp
index 086f5d3b..60092bf0 100644
--- a/hipfile/src/nvidia_detail/hipfile.cpp
+++ b/hipfile/src/nvidia_detail/hipfile.cpp
@@ -3,8 +3,15 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "hipfile.h"
 #include "hipfile-cufile.h"
+#include "hipfile-types.h"
 
+#include <cuda.h>
+#include <cufile.h>
+#include <driver_types.h>
+#include <hip/hip_runtime_api.h>
+#include <sys/types.h>
 #include <vector>
 
 using namespace std;
diff --git a/hipfile/test/hipfile-cufile.cpp b/hipfile/test/hipfile-cufile.cpp
index 0dceb3a6..7649b1ee 100644
--- a/hipfile/test/hipfile-cufile.cpp
+++ b/hipfile/test/hipfile-cufile.cpp
@@ -5,12 +5,19 @@
 
 #include "hipfile.h"
 #include "hipfile-cufile.h"
-#include "test-common.h"
-
 #include "hipfile-warnings.h"
 #include "invalid-enum.h"
+#include "test-common.h"
 
 #include <gtest/gtest.h>
+#include <hip/hip_runtime_api.h>
+#include <memory>
+#include <stdexcept>
+
+#ifdef __HIP_PLATFORM_NVIDIA__
+#include <cuda.h>
+#include <cufile.h>
+#endif
 
 // Put tests inside the macros to suppress the global constructor
 // warnings
diff --git a/hipfile/test/system/driver.cpp b/hipfile/test/system/driver.cpp
index 8ef4033b..cfd0d91d 100644
--- a/hipfile/test/system/driver.cpp
+++ b/hipfile/test/system/driver.cpp
@@ -18,6 +18,10 @@
 #include <time.h>
 #include <vector>
 
+#ifdef __HIP_PLATFORM_NVIDIA__
+#include <driver_types.h>
+#endif
+
 using namespace std;
 
 extern SystemTestOptions test_env;