diff --git a/src/backend/gl/glx.c b/src/backend/gl/glx.c
index d30dc9f..681bd17 100644
--- a/src/backend/gl/glx.c
+++ b/src/backend/gl/glx.c
@@ -615,7 +615,7 @@ void glxext_init(Display *dpy, int screen) {
 #endif
 #undef check_ext
 
-#define lookup(name) (name = (__typeof__(name))glXGetProcAddress((GLubyte *)#name))
+#define lookup(name) ((name) = (__typeof__(name))glXGetProcAddress((GLubyte *)#name))
 	// Checking if the returned function pointer is NULL is not really necessary,
 	// or maybe not even useful, since glXGetProcAddress might always return
 	// something. We are doing it just for completeness' sake.
diff --git a/src/backend/gl/glx.h b/src/backend/gl/glx.h
index ce8702a..c7ff281 100644
--- a/src/backend/gl/glx.h
+++ b/src/backend/gl/glx.h
@@ -12,11 +12,11 @@
 #undef glXBindTexImageEXT
 #undef glXReleaseTexImageEXT
 #include <X11/Xlib.h>
-#include <xcb/xcb.h>
 #include <xcb/render.h>
+#include <xcb/xcb.h>
 
-#include "log.h"
 #include "compiler.h"
+#include "log.h"
 #include "utils.h"
 #include "x.h"