diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 0228e9bc3..bcc3c316a 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -17,6 +17,7 @@
 add_subdirectory(arch)
 add_subdirectory(base)
 add_subdirectory(client)
+add_subdirectory(common)
 add_subdirectory(deskflow)
 add_subdirectory(io)
 add_subdirectory(ipc)
diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
new file mode 100644
index 000000000..2dc4e85dc
--- /dev/null
+++ b/src/lib/common/CMakeLists.txt
@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+
+add_library(common INTERFACE
+  basic_types.h
+  common.h
+  constants.h
+  copyright.h
+  IInterface.h
+  ipc.h
+  stdbitset.h
+  stddeque.h
+  stdexcept.h
+  stdfstream.h
+  stdistream.h
+  stdlist.h
+  stdmap.h
+  stdostream.h
+  stdpost.h
+  stdpre.h
+  stdset.h
+  stdsstream.h
+  stdstring.h
+  stdvector.h
+  version.h
+)
+
+if(APPLE)
+  target_sources(common INTERFACE MacOSXPrecomp.h)
+endif()
+
+target_include_directories(common
+  INTERFACE
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
diff --git a/src/lib/common/IInterface.h b/src/lib/common/IInterface.h
index 125f2a6ab..c47e5f3bd 100644
--- a/src/lib/common/IInterface.h
+++ b/src/lib/common/IInterface.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common.h"
 
 //! Base class of interfaces
 /*!
diff --git a/src/lib/common/basic_types.h b/src/lib/common/basic_types.h
index 94ebe6ad6..f11a199f5 100644
--- a/src/lib/common/basic_types.h
+++ b/src/lib/common/basic_types.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common.h"
 
 // VC++ has built-in sized types
 // moved from common.h (why was it there?)
diff --git a/src/lib/common/ipc.h b/src/lib/common/ipc.h
index 33cf88b0c..cd4279586 100644
--- a/src/lib/common/ipc.h
+++ b/src/lib/common/ipc.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "common/basic_types.h"
+#include "basic_types.h"
 
 enum class IpcMessageType : UInt8
 {
diff --git a/src/lib/common/stdbitset.h b/src/lib/common/stdbitset.h
index 31a78274a..1671697ec 100644
--- a/src/lib/common/stdbitset.h
+++ b/src/lib/common/stdbitset.h
@@ -17,8 +17,8 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
 #include <bitset>
 
-#include "common/stdpost.h"
+#include "stdpost.h"
diff --git a/src/lib/common/stddeque.h b/src/lib/common/stddeque.h
index 157e59859..7cb135573 100644
--- a/src/lib/common/stddeque.h
+++ b/src/lib/common/stddeque.h
@@ -17,8 +17,8 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
 #include <deque>
 
-#include "common/stdpost.h"
+#include "stdpost.h"
diff --git a/src/lib/common/stdfstream.h b/src/lib/common/stdfstream.h
index 243c56994..fa26e92e0 100644
--- a/src/lib/common/stdfstream.h
+++ b/src/lib/common/stdfstream.h
@@ -17,9 +17,9 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
-#include "common/stdistream.h"
+#include "stdistream.h"
 #include <fstream>
 
-#include "common/stdpost.h"
+#include "stdpost.h"
diff --git a/src/lib/common/stdistream.h b/src/lib/common/stdistream.h
index 3525f6bdd..5cded0249 100644
--- a/src/lib/common/stdistream.h
+++ b/src/lib/common/stdistream.h
@@ -17,7 +17,7 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
 #if HAVE_ISTREAM
 #include <istream>
@@ -25,7 +25,7 @@
 #include <iostream>
 #endif
 
-#include "common/stdpost.h"
+#include "stdpost.h"
 
 #if defined(_MSC_VER) && _MSC_VER <= 1200
 // VC++6 istream has no overloads for __int* types, .NET does
diff --git a/src/lib/common/stdlist.h b/src/lib/common/stdlist.h
index 384e4fcb4..e4991d41c 100644
--- a/src/lib/common/stdlist.h
+++ b/src/lib/common/stdlist.h
@@ -17,8 +17,8 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
 #include <list>
 
-#include "common/stdpost.h"
+#include "stdpost.h"
diff --git a/src/lib/common/stdmap.h b/src/lib/common/stdmap.h
index 5d855dcc2..38c0f85a3 100644
--- a/src/lib/common/stdmap.h
+++ b/src/lib/common/stdmap.h
@@ -17,8 +17,8 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
 #include <map>
 
-#include "common/stdpost.h"
+#include "stdpost.h"
diff --git a/src/lib/common/stdostream.h b/src/lib/common/stdostream.h
index 201a1ea74..e847f2287 100644
--- a/src/lib/common/stdostream.h
+++ b/src/lib/common/stdostream.h
@@ -17,7 +17,7 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
 #if HAVE_OSTREAM
 #include <ostream>
@@ -25,4 +25,4 @@
 #include <iostream>
 #endif
 
-#include "common/stdpost.h"
+#include "stdpost.h"
diff --git a/src/lib/common/stdset.h b/src/lib/common/stdset.h
index 0d57237d2..ef1d58335 100644
--- a/src/lib/common/stdset.h
+++ b/src/lib/common/stdset.h
@@ -17,8 +17,8 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
 #include <set>
 
-#include "common/stdpost.h"
+#include "stdpost.h"
diff --git a/src/lib/common/stdsstream.h b/src/lib/common/stdsstream.h
index 18e64b830..08bdb65bf 100644
--- a/src/lib/common/stdsstream.h
+++ b/src/lib/common/stdsstream.h
@@ -17,7 +17,7 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
 #if HAVE_SSTREAM || !defined(__GNUC__) || (__GNUC__ >= 3)
 
@@ -339,6 +339,6 @@ private:
 
 #endif /* not g++ 2.95 and no <sstream> */
 
-#include "common/stdistream.h"
+#include "stdistream.h"
 
-#include "common/stdpost.h"
+#include "stdpost.h"
diff --git a/src/lib/common/stdstring.h b/src/lib/common/stdstring.h
index b01ccf67e..b0caa6f3e 100644
--- a/src/lib/common/stdstring.h
+++ b/src/lib/common/stdstring.h
@@ -17,8 +17,8 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
 #include <string>
 
-#include "common/stdpost.h"
+#include "stdpost.h"
diff --git a/src/lib/common/stdvector.h b/src/lib/common/stdvector.h
index c7bc27bb2..987128793 100644
--- a/src/lib/common/stdvector.h
+++ b/src/lib/common/stdvector.h
@@ -17,8 +17,8 @@
  */
 #pragma once
 
-#include "common/stdpre.h"
+#include "stdpre.h"
 
 #include <vector>
 
-#include "common/stdpost.h"
+#include "stdpost.h"