diff --git a/common/Ref.hpp b/common/Ref.hpp
index b627c8e..6733fc9 100644
--- a/common/Ref.hpp
+++ b/common/Ref.hpp
@@ -2,5 +2,6 @@
 #define COMMON_REF_HPP
 
 #include "common/ref/TRefCnt.hpp"
+#include "common/ref/TRefCntPtr.hpp"
 
 #endif
diff --git a/common/ref/TRefCnt.hpp b/common/ref/TRefCnt.hpp
index 74a3eb4..5dbbac0 100644
--- a/common/ref/TRefCnt.hpp
+++ b/common/ref/TRefCnt.hpp
@@ -1,5 +1,5 @@
-#ifndef COMMON_T_REF_CNT_HPP
-#define COMMON_T_REF_CNT_HPP
+#ifndef COMMON_REF_T_REF_CNT_HPP
+#define COMMON_REF_T_REF_CNT_HPP
 
 #include <cstdint>
 
@@ -9,11 +9,4 @@ class TRefCnt {
     uint32_t m_refcnt;
 };
 
-template <class T>
-class TRefCntPtr {
-    public:
-    // Member variables
-    T* m_ptr;
-};
-
 #endif
diff --git a/common/ref/TRefCntPtr.hpp b/common/ref/TRefCntPtr.hpp
new file mode 100644
index 0000000..49174db
--- /dev/null
+++ b/common/ref/TRefCntPtr.hpp
@@ -0,0 +1,13 @@
+#ifndef COMMON_REF_T_REF_CNT_PTR_HPP
+#define COMMON_REF_T_REF_CNT_PTR_HPP
+
+#include <cstdint>
+
+template <class T>
+class TRefCntPtr {
+    public:
+    // Member variables
+    T* m_ptr;
+};
+
+#endif
diff --git a/common/string/RCString.hpp b/common/string/RCString.hpp
index c4b3beb..dbe2510 100644
--- a/common/string/RCString.hpp
+++ b/common/string/RCString.hpp
@@ -1,7 +1,7 @@
 #ifndef COMMON_STRING_RC_STRING_HPP
 #define COMMON_STRING_RC_STRING_HPP
 
-#include "common/ref/TRefCnt.hpp"
+#include "common/Ref.hpp"
 #include <cstdlib>
 
 class RCString : public TRefCnt {