diff --git a/RubeusCore/CMakeLists.txt b/RubeusCore/CMakeLists.txt
index 39aa177..360a7e5 100644
--- a/RubeusCore/CMakeLists.txt
+++ b/RubeusCore/CMakeLists.txt
@@ -63,7 +63,8 @@ if(WIN32)
 
     target_link_libraries(RubeusCore PUBLIC
         ${OPENGL_LIBRARIES}
-		${VENDOR_WIN_LIBRARIES}
+	${VENDOR_WIN_LIBRARIES}
+	${GLFW_STATIC_LIBRARIES}
     )
 
 	add_custom_command(TARGET RubeusCore POST_BUILD
@@ -79,7 +80,7 @@ if(UNIX)
         ${OPENGL_LIBRARIES}
         -lGLEW
         ${SFML_LIBRARIES}
-        ${GLFW_LIBRARIES}
+        ${GLFW_STATIC_LIBRARIES}
         ${IL_LIBRARIES}
         ${ILU_LIBRARIES}
         ${VENDOR_LINUX_LIBRARIES}
diff --git a/RubeusCore/ProjectManager/CMakeLists.txt b/RubeusCore/ProjectManager/CMakeLists.txt
index d0c08c1..de8f3a6 100644
--- a/RubeusCore/ProjectManager/CMakeLists.txt
+++ b/RubeusCore/ProjectManager/CMakeLists.txt
@@ -39,9 +39,9 @@ if(UNIX)
     target_link_libraries(ProjectManager PUBLIC
         ${OPENGL_LIBRARIES}
         -lGLEW
-        ${GLFW_LIBRARIES}
+        ${GLFW_STATIC_LIBRARIES}
         ${VENDOR_LINUX_LIBRARIES}
         -lstdc++fs
 		imgui
     )
-endif(UNIX)
\ No newline at end of file
+endif(UNIX)
diff --git a/RubeusCore/Source/Awerere/awerere_flag.cpp b/RubeusCore/Source/Awerere/awerere_flag.cpp
index aaf5d64..8f767ee 100644
--- a/RubeusCore/Source/Awerere/awerere_flag.cpp
+++ b/RubeusCore/Source/Awerere/awerere_flag.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <awerere_flag.h>
+#include <cstddef>
 
 namespace Rubeus
 {
diff --git a/RubeusCore/Source/Awerere/awerere_flag.h b/RubeusCore/Source/Awerere/awerere_flag.h
index 78a2ab4..77aa0a9 100644
--- a/RubeusCore/Source/Awerere/awerere_flag.h
+++ b/RubeusCore/Source/Awerere/awerere_flag.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <vector>
+#include <cstddef>
 
 namespace Rubeus
 {