diff --git a/BUILD.gn b/BUILD.gn
index 0166f0d..98b79ec 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -16,6 +16,7 @@
   cflags += [
     "-Wno-int-conversion",
     "-Wno-implicit-function-declaration",
+    "-Wno-missing-field-initializers",
     "-Wno-sign-compare",
   ]
 }
@@ -41,7 +42,7 @@
       "_GLFW_COCOA",
       "_GLFW_USE_RETINA",
     ]
-    libs = [
+    frameworks = [
       "Cocoa.framework",
       "CoreFoundation.framework",
       "CoreGraphics.framework",
@@ -70,6 +71,13 @@
       "src/x11_window.c",
       "src/xkb_unicode.c",
     ]
+    libs = [
+      "X11",
+      "Xinerama",
+      "Xcursor",
+      "Xrandr",
+    ]
   }
   public_configs = [ ":glfw_config" ]
+  configs += [ "//build/config:Wno-conversion" ]
 }