diff --git a/src/common/uarch.hpp b/src/common/uarch.hpp
index faef6ac..3dc4019 100644
--- a/src/common/uarch.hpp
+++ b/src/common/uarch.hpp
@@ -31,6 +31,4 @@ struct uarch {
   char* chip_str;
 };
 
-char* get_str_process(struct uarch* arch);
-
 #endif
diff --git a/src/cuda/uarch.cpp b/src/cuda/uarch.cpp
index 80f14b4..425f74b 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 10937e3..375b001 100644
--- a/src/cuda/uarch.hpp
+++ b/src/cuda/uarch.hpp
@@ -2,7 +2,6 @@
 #define __CUDA_UARCH__
 
 #include "../common/gpu.hpp"
-#include "../common/uarch.hpp"
 
 struct uarch;
 
@@ -12,6 +11,7 @@ MEMTYPE guess_memtype_from_cmul_and_uarch(int ddr, struct uarch* arch);
 char* get_str_uarch_cuda(struct uarch* arch);
 char* get_str_cc(struct uarch* arch);
 char* get_str_chip(struct uarch* arch);
+char* get_str_process(struct uarch* arch);
 void free_uarch_struct(struct uarch* arch);
 
 #endif
diff --git a/src/hsa/uarch.cpp b/src/hsa/uarch.cpp
index 5258073..17614a4 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 47769c6..0225ba1 100644
--- a/src/hsa/uarch.hpp
+++ b/src/hsa/uarch.hpp
@@ -2,11 +2,11 @@
 #define __HSA_UARCH__
 
 #include "../common/gpu.hpp"
-#include "../common/uarch.hpp"
 
 struct uarch;
 
 struct uarch* get_uarch_from_hsa(struct gpu_info* gpu, char* gpu_name);
 char* get_str_uarch_hsa(struct uarch* arch);
+char* get_str_process(struct uarch* arch); // TODO: Shouldnt we define this in the cpp?
 
 #endif
diff --git a/src/intel/uarch.cpp b/src/intel/uarch.cpp
index 580c1e1..3f891ff 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 bfeed1d..2947988 100644
--- a/src/intel/uarch.hpp
+++ b/src/intel/uarch.hpp
@@ -2,7 +2,6 @@
 #define __INTEL_UARCH__
 
 #include "../common/gpu.hpp"
-#include "../common/uarch.hpp"
 
 struct uarch;