diff --git a/src/cuda/uarch.cpp b/src/cuda/uarch.cpp
index 425f74b..80f14b4 100644
--- a/src/cuda/uarch.cpp
+++ b/src/cuda/uarch.cpp
@@ -5,10 +5,10 @@
 #include <cstdio>
 #include <cstring>
 
-#include "../common/uarch.hpp"
 #include "../common/global.hpp"
 #include "../common/gpu.hpp"
 #include "chips.hpp"
+#include "uarch.hpp"
 
 // Any clock multiplier
 #define CM_ANY               -1
diff --git a/src/cuda/uarch.hpp b/src/cuda/uarch.hpp
index d8f9801..10937e3 100644
--- a/src/cuda/uarch.hpp
+++ b/src/cuda/uarch.hpp
@@ -2,6 +2,7 @@
 #define __CUDA_UARCH__
 
 #include "../common/gpu.hpp"
+#include "../common/uarch.hpp"
 
 struct uarch;
 
diff --git a/src/hsa/uarch.cpp b/src/hsa/uarch.cpp
index 17614a4..5258073 100644
--- a/src/hsa/uarch.cpp
+++ b/src/hsa/uarch.cpp
@@ -2,9 +2,9 @@
 #include <cstdint>
 #include <cstring>
 
-#include "../common/uarch.hpp"
 #include "../common/global.hpp"
 #include "../common/gpu.hpp"
+#include "uarch.hpp"
 #include "chips.hpp"
 
 // MICROARCH values
diff --git a/src/hsa/uarch.hpp b/src/hsa/uarch.hpp
index 3de36db..47769c6 100644
--- a/src/hsa/uarch.hpp
+++ b/src/hsa/uarch.hpp
@@ -2,6 +2,7 @@
 #define __HSA_UARCH__
 
 #include "../common/gpu.hpp"
+#include "../common/uarch.hpp"
 
 struct uarch;
 
diff --git a/src/intel/uarch.cpp b/src/intel/uarch.cpp
index 3f891ff..580c1e1 100644
--- a/src/intel/uarch.cpp
+++ b/src/intel/uarch.cpp
@@ -3,12 +3,12 @@
 #include <cstring>
 #include <cstdio>
 
-#include "../common/uarch.hpp"
 #include "../common/global.hpp"
 #include "../common/gpu.hpp"
 #include "chips.hpp"
 #include "pci.hpp"
 #include "cpuid.hpp"
+#include "uarch.hpp"
 
 // Data not available
 #define NA                   -1
diff --git a/src/intel/uarch.hpp b/src/intel/uarch.hpp
index 2947988..bfeed1d 100644
--- a/src/intel/uarch.hpp
+++ b/src/intel/uarch.hpp
@@ -2,6 +2,7 @@
 #define __INTEL_UARCH__
 
 #include "../common/gpu.hpp"
+#include "../common/uarch.hpp"
 
 struct uarch;