3 files changed, 27 insertions, 10 deletions
diff --git a/frameworks/libX11.fwrk/headers/Config.h b/frameworks/libX11.fwrk/headers/Config.h
index 7056070..f311fdb 100644
--- a/frameworks/libX11.fwrk/headers/Config.h
+++ b/frameworks/libX11.fwrk/headers/Config.h
@@ -6,6 +6,6 @@
 #ifndef X11_FOUNDATION_H
 #define X11_FOUNDATION_H
 
-#include <X11/Xlib.h>
+
 
 #endif
diff --git a/frameworks/libX11.fwrk/libX11.fwrk.json b/frameworks/libX11.fwrk/libX11.fwrk.json
index 8e120d3..7f2f67b 100644
--- a/frameworks/libX11.fwrk/libX11.fwrk.json
+++ b/frameworks/libX11.fwrk/libX11.fwrk.json
@@ -1,7 +1,7 @@
 {
     "compiler_path": "x86_64-w64-mingw32-g++",
     "compiler_std": "c++20",
-    "headers_path": ["../", "./", "../../../src", "../../../src/kernel"],
+    "headers_path": ["../", "./", "../../src/kernel", "../../src/kernel/src"],
     "sources_path": ["src/*.cpp"],
     "output_name": "./dist/libX11.fwrk.dylib",
     "compiler_flags": [
diff --git a/frameworks/libX11.fwrk/src/X11ConnMgr.cpp b/frameworks/libX11.fwrk/src/X11ConnMgr.cpp
index 4d3d61a..aca5e8f 100644
--- a/frameworks/libX11.fwrk/src/X11ConnMgr.cpp
+++ b/frameworks/libX11.fwrk/src/X11ConnMgr.cpp
@@ -5,17 +5,34 @@
 
 #include <libSystem/SystemKit/System.h>
 #include <libX11.fwrk/headers/Config.h>
-#include <CoreFoundation.fwrk/headers/String.h>
 
 #define X11_ARRAY_CHECK(PTR) PTR != nullptr
-#define X11_ARRAY_INDEX(ARR, PTR, LEN) ARR[((SInt64)PTR) % LEN]
+#define X11_ARRAY_INDEX(ARR, PTR, LEN) ARR[((SInt64) PTR) % LEN]
 
-struct X11Connection final {
-    SInt32 fSocket; 
-    SInt32 fType;
-    SInt32 fFlags;
-    SInt32 fPad;
+namespace X11 {
+
+    struct X11Connection final {
+  SInt32 fSocket;
+  SInt32 fType;
+  SInt32 fFlags;
+  SInt32 fPad;
 };
 
-typedef X11Connection* X11ConnectionPtr;
+typedef X11Connection*    X11ConnectionPtr;
 typedef X11ConnectionPtr* X11ConnectionArray;
+
+static X11ConnectionPtr X11MakeConnection() {
+  auto ptr = new X11Connection{};
+  if (!ptr) return nullptr;
+
+  return ptr;
+}
+
+static Void X11DeleteConnection(X11ConnectionPtr ptr) {
+  if (!ptr) return;
+
+  delete ptr;
+  ptr = nullptr;
+}
+
+}  // namespace X11
+\ No newline at end of file