diff --git a/raylib/cgo_darwin.go b/raylib/cgo_darwin.go
index 7b4541c..22893cd 100644
--- a/raylib/cgo_darwin.go
+++ b/raylib/cgo_darwin.go
@@ -13,12 +13,14 @@ package raylib
 #include "external/glfw/src/cocoa_init.m"
 #include "external/glfw/src/cocoa_joystick.m"
 #include "external/glfw/src/cocoa_monitor.m"
-#include "external/glfw/src/cocoa_window.m"
 #include "external/glfw/src/cocoa_time.c"
-#include "external/glfw/src/posix_tls.c"
+#include "external/glfw/src/cocoa_window.m"
+#include "external/glfw/src/posix_thread.c"
+#include "external/glfw/src/posix_time.c"
 #include "external/glfw/src/nsgl_context.m"
+#include "external/glfw/src/osmesa_context.c"
 
-#cgo darwin LDFLAGS: -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo
+#cgo darwin LDFLAGS: -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -framework CoreFoundation
 #cgo darwin CFLAGS: -x objective-c -Iexternal/glfw/include -D_GLFW_COCOA -D_GLFW_USE_CHDIR -D_GLFW_USE_MENUBAR -D_GLFW_USE_RETINA -Wno-deprecated-declarations -DPLATFORM_DESKTOP
 
 #cgo darwin,!noaudio LDFLAGS: -framework OpenAL
diff --git a/raylib/cgo_linux.go b/raylib/cgo_linux.go
index 9046e14..fa8f340 100644
--- a/raylib/cgo_linux.go
+++ b/raylib/cgo_linux.go
@@ -25,14 +25,15 @@ package raylib
 #endif
 
 #include "external/glfw/src/linux_joystick.c"
+#include "external/glfw/src/posix_thread.c"
 #include "external/glfw/src/posix_time.c"
-#include "external/glfw/src/posix_tls.c"
 #include "external/glfw/src/xkb_unicode.c"
 #include "external/glfw/src/egl_context.c"
+#include "external/glfw/src/osmesa_context.c"
 
 #cgo linux CFLAGS: -Iexternal/glfw/include -DPLATFORM_DESKTOP
 
-#cgo linux,!wayland LDFLAGS: -lGL -lm -pthread -ldl -lrt -lX11 -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
+#cgo linux,!wayland LDFLAGS: -lGL -lm -pthread -ldl -lrt -lX11
 #cgo linux,wayland LDFLAGS: -lGL -lm -pthread -ldl -lrt -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon
 
 #cgo linux,!wayland CFLAGS: -D_GLFW_X11
diff --git a/raylib/cgo_windows.go b/raylib/cgo_windows.go
index cc11a55..2d215f7 100644
--- a/raylib/cgo_windows.go
+++ b/raylib/cgo_windows.go
@@ -13,11 +13,12 @@ package raylib
 #include "external/glfw/src/win32_init.c"
 #include "external/glfw/src/win32_joystick.c"
 #include "external/glfw/src/win32_monitor.c"
+#include "external/glfw/src/win32_thread.c"
 #include "external/glfw/src/win32_time.c"
-#include "external/glfw/src/win32_tls.c"
 #include "external/glfw/src/win32_window.c"
 #include "external/glfw/src/wgl_context.c"
 #include "external/glfw/src/egl_context.c"
+#include "external/glfw/src/osmesa_context.c"
 
 #cgo windows LDFLAGS: -lopengl32 -lgdi32 -lwinmm -lole32
 #cgo windows CFLAGS: -D_GLFW_WIN32 -Iexternal/glfw/include -Iexternal/glfw/deps/mingw -DPLATFORM_DESKTOP