diff --git a/external/glad_2/glad_glx.h b/external/glad_2/glad_glx.h
index d402402..b66f40e 100644
--- a/external/glad_2/glad_glx.h
+++ b/external/glad_2/glad_glx.h
@@ -22,7 +22,7 @@
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <glad/glad.h>
+#include <glad_2/glad.h>
 
 #ifndef __glad_glxext_h_
 
diff --git a/external/glad_4/glad_glx.h b/external/glad_4/glad_glx.h
index d402402..20417f1 100644
--- a/external/glad_4/glad_glx.h
+++ b/external/glad_4/glad_glx.h
@@ -22,7 +22,7 @@
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <glad/glad.h>
+#include <glad_4/glad.h>
 
 #ifndef __glad_glxext_h_
 
diff --git a/premake5.lua b/premake5.lua
index 16d7e6f..8ab0d9e 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -109,31 +109,44 @@ solution (solution_name)
 		includedirs { external_dir }
 		vpaths { ["Headers"] = "**.h", ["Sources"] = "**.c" }	
 
-		if is_gfxapi("opengl_2") then
-			files 
-			{ 
-				external_dir .. "/glad_2/khrplatform.h",
-				external_dir .. "/glad_2/glad.h", 
-				external_dir .. "/glad_2/glad.c",
-			}
-		end
+		configuration { "windows" }		
+			if is_gfxapi("opengl_2") then
+				files 
+				{ 
+					external_dir .. "/glad_2/khrplatform.h",
+					external_dir .. "/glad_2/glad.h", 
+					external_dir .. "/glad_2/glad.c",
+				}
+			end
+			
+			if is_gfxapi("opengl_4") then
+				files 
+				{ 
+					external_dir .. "/glad_4/khrplatform.h",
+					external_dir .. "/glad_4/glad.h", 
+					external_dir .. "/glad_4/glad.c",
+				}
+			end
 		
-		if is_gfxapi("opengl_4") then
-			files 
-			{ 
-				external_dir .. "/glad_4/khrplatform.h",
-				external_dir .. "/glad_4/glad.h", 
-				external_dir .. "/glad_4/glad.c",
-			}
-		end
-		
-		configuration { "not windows", "not macosx" }
-			files 
-			{ 
-				external_dir .. "/glad_4/glad_glx.h", 
-				external_dir .. "/glad_4/glad_glx.c",
-			}	
-		 
+		configuration { "linux" }
+			if is_gfxapi("opengl_2") then
+				files 
+				{ 
+					external_dir .. "/glad_2/khrplatform.h",
+					external_dir .. "/glad_2/glad_glx.h", 
+					external_dir .. "/glad_2/glad_glx.c",
+				}
+			end
+			
+			if is_gfxapi("opengl_4") then
+				files 
+				{ 
+					external_dir .. "/glad_4/khrplatform.h",
+					external_dir .. "/glad_4/glad_glx.h", 
+					external_dir .. "/glad_4/glad_glx.c",
+				}
+			end
+			
 	project "glfw"
 		kind "StaticLib"
 		language "C"
@@ -179,7 +192,7 @@ solution (solution_name)
 			}
 
 		-- linux
-		configuration { "not windows", "not macosx" }
+		configuration { "linux" }
          	buildoptions { "-pthread" }
 			files 
 			{	 
@@ -323,11 +336,8 @@ solution (solution_name)
 		configuration { "windows" }
 			links { "opengl32", "winmm" }
 			
-		configuration { "not windows", "not macosx" }
-			links 
-			{ 
-				"GL", "rt", "m", "dl", "pthread"			
-			}
+		configuration { "linux" }
+			links { "GL", "X11", "Xrandr", "Xinerama", "Xcursor", "pthread", "dl" }
 		
 	project "hello_world"
 		kind "ConsoleApp"