diff --git a/src/null_window.c b/src/null_window.c
index c4b7876a..0ea9f5b0 100644
--- a/src/null_window.c
+++ b/src/null_window.c
@@ -706,8 +706,8 @@ void _glfwGetRequiredInstanceExtensionsNull(char** extensions)
     if (!_glfw.vk.KHR_surface || !_glfw.vk.EXT_headless_surface)
         return;
 
-    extensions[0] = "VK_KHR_surface";
-    extensions[1] = "VK_EXT_headless_surface";
+    extensions[0] = (char*) "VK_KHR_surface";
+    extensions[1] = (char*) "VK_EXT_headless_surface";
 }
 
 GLFWbool _glfwGetPhysicalDevicePresentationSupportNull(VkInstance instance,
diff --git a/src/x11_init.c b/src/x11_init.c
index 651283d2..facc3d1b 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -234,127 +234,127 @@ static void _glfwCreateKeyTablesX11(void)
             char* name;
         } keymap[] =
         {
-            { GLFW_KEY_GRAVE_ACCENT, "TLDE" },
-            { GLFW_KEY_1, "AE01" },
-            { GLFW_KEY_2, "AE02" },
-            { GLFW_KEY_3, "AE03" },
-            { GLFW_KEY_4, "AE04" },
-            { GLFW_KEY_5, "AE05" },
-            { GLFW_KEY_6, "AE06" },
-            { GLFW_KEY_7, "AE07" },
-            { GLFW_KEY_8, "AE08" },
-            { GLFW_KEY_9, "AE09" },
-            { GLFW_KEY_0, "AE10" },
-            { GLFW_KEY_MINUS, "AE11" },
-            { GLFW_KEY_EQUAL, "AE12" },
-            { GLFW_KEY_Q, "AD01" },
-            { GLFW_KEY_W, "AD02" },
-            { GLFW_KEY_E, "AD03" },
-            { GLFW_KEY_R, "AD04" },
-            { GLFW_KEY_T, "AD05" },
-            { GLFW_KEY_Y, "AD06" },
-            { GLFW_KEY_U, "AD07" },
-            { GLFW_KEY_I, "AD08" },
-            { GLFW_KEY_O, "AD09" },
-            { GLFW_KEY_P, "AD10" },
-            { GLFW_KEY_LEFT_BRACKET, "AD11" },
-            { GLFW_KEY_RIGHT_BRACKET, "AD12" },
-            { GLFW_KEY_A, "AC01" },
-            { GLFW_KEY_S, "AC02" },
-            { GLFW_KEY_D, "AC03" },
-            { GLFW_KEY_F, "AC04" },
-            { GLFW_KEY_G, "AC05" },
-            { GLFW_KEY_H, "AC06" },
-            { GLFW_KEY_J, "AC07" },
-            { GLFW_KEY_K, "AC08" },
-            { GLFW_KEY_L, "AC09" },
-            { GLFW_KEY_SEMICOLON, "AC10" },
-            { GLFW_KEY_APOSTROPHE, "AC11" },
-            { GLFW_KEY_Z, "AB01" },
-            { GLFW_KEY_X, "AB02" },
-            { GLFW_KEY_C, "AB03" },
-            { GLFW_KEY_V, "AB04" },
-            { GLFW_KEY_B, "AB05" },
-            { GLFW_KEY_N, "AB06" },
-            { GLFW_KEY_M, "AB07" },
-            { GLFW_KEY_COMMA, "AB08" },
-            { GLFW_KEY_PERIOD, "AB09" },
-            { GLFW_KEY_SLASH, "AB10" },
-            { GLFW_KEY_BACKSLASH, "BKSL" },
-            { GLFW_KEY_WORLD_1, "LSGT" },
-            { GLFW_KEY_SPACE, "SPCE" },
-            { GLFW_KEY_ESCAPE, "ESC" },
-            { GLFW_KEY_ENTER, "RTRN" },
-            { GLFW_KEY_TAB, "TAB" },
-            { GLFW_KEY_BACKSPACE, "BKSP" },
-            { GLFW_KEY_INSERT, "INS" },
-            { GLFW_KEY_DELETE, "DELE" },
-            { GLFW_KEY_RIGHT, "RGHT" },
-            { GLFW_KEY_LEFT, "LEFT" },
-            { GLFW_KEY_DOWN, "DOWN" },
-            { GLFW_KEY_UP, "UP" },
-            { GLFW_KEY_PAGE_UP, "PGUP" },
-            { GLFW_KEY_PAGE_DOWN, "PGDN" },
-            { GLFW_KEY_HOME, "HOME" },
-            { GLFW_KEY_END, "END" },
-            { GLFW_KEY_CAPS_LOCK, "CAPS" },
-            { GLFW_KEY_SCROLL_LOCK, "SCLK" },
-            { GLFW_KEY_NUM_LOCK, "NMLK" },
-            { GLFW_KEY_PRINT_SCREEN, "PRSC" },
-            { GLFW_KEY_PAUSE, "PAUS" },
-            { GLFW_KEY_F1, "FK01" },
-            { GLFW_KEY_F2, "FK02" },
-            { GLFW_KEY_F3, "FK03" },
-            { GLFW_KEY_F4, "FK04" },
-            { GLFW_KEY_F5, "FK05" },
-            { GLFW_KEY_F6, "FK06" },
-            { GLFW_KEY_F7, "FK07" },
-            { GLFW_KEY_F8, "FK08" },
-            { GLFW_KEY_F9, "FK09" },
-            { GLFW_KEY_F10, "FK10" },
-            { GLFW_KEY_F11, "FK11" },
-            { GLFW_KEY_F12, "FK12" },
-            { GLFW_KEY_F13, "FK13" },
-            { GLFW_KEY_F14, "FK14" },
-            { GLFW_KEY_F15, "FK15" },
-            { GLFW_KEY_F16, "FK16" },
-            { GLFW_KEY_F17, "FK17" },
-            { GLFW_KEY_F18, "FK18" },
-            { GLFW_KEY_F19, "FK19" },
-            { GLFW_KEY_F20, "FK20" },
-            { GLFW_KEY_F21, "FK21" },
-            { GLFW_KEY_F22, "FK22" },
-            { GLFW_KEY_F23, "FK23" },
-            { GLFW_KEY_F24, "FK24" },
-            { GLFW_KEY_F25, "FK25" },
-            { GLFW_KEY_KP_0, "KP0" },
-            { GLFW_KEY_KP_1, "KP1" },
-            { GLFW_KEY_KP_2, "KP2" },
-            { GLFW_KEY_KP_3, "KP3" },
-            { GLFW_KEY_KP_4, "KP4" },
-            { GLFW_KEY_KP_5, "KP5" },
-            { GLFW_KEY_KP_6, "KP6" },
-            { GLFW_KEY_KP_7, "KP7" },
-            { GLFW_KEY_KP_8, "KP8" },
-            { GLFW_KEY_KP_9, "KP9" },
-            { GLFW_KEY_KP_DECIMAL, "KPDL" },
-            { GLFW_KEY_KP_DIVIDE, "KPDV" },
-            { GLFW_KEY_KP_MULTIPLY, "KPMU" },
-            { GLFW_KEY_KP_SUBTRACT, "KPSU" },
-            { GLFW_KEY_KP_ADD, "KPAD" },
-            { GLFW_KEY_KP_ENTER, "KPEN" },
-            { GLFW_KEY_KP_EQUAL, "KPEQ" },
-            { GLFW_KEY_LEFT_SHIFT, "LFSH" },
-            { GLFW_KEY_LEFT_CONTROL, "LCTL" },
-            { GLFW_KEY_LEFT_ALT, "LALT" },
-            { GLFW_KEY_LEFT_SUPER, "LWIN" },
-            { GLFW_KEY_RIGHT_SHIFT, "RTSH" },
-            { GLFW_KEY_RIGHT_CONTROL, "RCTL" },
-            { GLFW_KEY_RIGHT_ALT, "RALT" },
-            { GLFW_KEY_RIGHT_ALT, "LVL3" },
-            { GLFW_KEY_RIGHT_ALT, "MDSW" },
-            { GLFW_KEY_RIGHT_SUPER, "RWIN" },
-            { GLFW_KEY_MENU, "MENU" }
+            { GLFW_KEY_GRAVE_ACCENT, (char*) "TLDE" },
+            { GLFW_KEY_1, (char*) "AE01" },
+            { GLFW_KEY_2, (char*) "AE02" },
+            { GLFW_KEY_3, (char*) "AE03" },
+            { GLFW_KEY_4, (char*) "AE04" },
+            { GLFW_KEY_5, (char*) "AE05" },
+            { GLFW_KEY_6, (char*) "AE06" },
+            { GLFW_KEY_7, (char*) "AE07" },
+            { GLFW_KEY_8, (char*) "AE08" },
+            { GLFW_KEY_9, (char*) "AE09" },
+            { GLFW_KEY_0, (char*) "AE10" },
+            { GLFW_KEY_MINUS, (char*) "AE11" },
+            { GLFW_KEY_EQUAL, (char*) "AE12" },
+            { GLFW_KEY_Q, (char*) "AD01" },
+            { GLFW_KEY_W, (char*) "AD02" },
+            { GLFW_KEY_E, (char*) "AD03" },
+            { GLFW_KEY_R, (char*) "AD04" },
+            { GLFW_KEY_T, (char*) "AD05" },
+            { GLFW_KEY_Y, (char*) "AD06" },
+            { GLFW_KEY_U, (char*) "AD07" },
+            { GLFW_KEY_I, (char*) "AD08" },
+            { GLFW_KEY_O, (char*) "AD09" },
+            { GLFW_KEY_P, (char*) "AD10" },
+            { GLFW_KEY_LEFT_BRACKET, (char*) "AD11" },
+            { GLFW_KEY_RIGHT_BRACKET, (char*) "AD12" },
+            { GLFW_KEY_A, (char*) "AC01" },
+            { GLFW_KEY_S, (char*) "AC02" },
+            { GLFW_KEY_D, (char*) "AC03" },
+            { GLFW_KEY_F, (char*) "AC04" },
+            { GLFW_KEY_G, (char*) "AC05" },
+            { GLFW_KEY_H, (char*) "AC06" },
+            { GLFW_KEY_J, (char*) "AC07" },
+            { GLFW_KEY_K, (char*) "AC08" },
+            { GLFW_KEY_L, (char*) "AC09" },
+            { GLFW_KEY_SEMICOLON, (char*) "AC10" },
+            { GLFW_KEY_APOSTROPHE, (char*) "AC11" },
+            { GLFW_KEY_Z, (char*) "AB01" },
+            { GLFW_KEY_X, (char*) "AB02" },
+            { GLFW_KEY_C, (char*) "AB03" },
+            { GLFW_KEY_V, (char*) "AB04" },
+            { GLFW_KEY_B, (char*) "AB05" },
+            { GLFW_KEY_N, (char*) "AB06" },
+            { GLFW_KEY_M, (char*) "AB07" },
+            { GLFW_KEY_COMMA, (char*) "AB08" },
+            { GLFW_KEY_PERIOD, (char*) "AB09" },
+            { GLFW_KEY_SLASH, (char*) "AB10" },
+            { GLFW_KEY_BACKSLASH, (char*) "BKSL" },
+            { GLFW_KEY_WORLD_1, (char*) "LSGT" },
+            { GLFW_KEY_SPACE, (char*) "SPCE" },
+            { GLFW_KEY_ESCAPE, (char*) "ESC" },
+            { GLFW_KEY_ENTER, (char*) "RTRN" },
+            { GLFW_KEY_TAB, (char*) "TAB" },
+            { GLFW_KEY_BACKSPACE, (char*) "BKSP" },
+            { GLFW_KEY_INSERT, (char*) "INS" },
+            { GLFW_KEY_DELETE, (char*) "DELE" },
+            { GLFW_KEY_RIGHT, (char*) "RGHT" },
+            { GLFW_KEY_LEFT, (char*) "LEFT" },
+            { GLFW_KEY_DOWN, (char*) "DOWN" },
+            { GLFW_KEY_UP, (char*) "UP" },
+            { GLFW_KEY_PAGE_UP, (char*) "PGUP" },
+            { GLFW_KEY_PAGE_DOWN, (char*) "PGDN" },
+            { GLFW_KEY_HOME, (char*) "HOME" },
+            { GLFW_KEY_END, (char*) "END" },
+            { GLFW_KEY_CAPS_LOCK, (char*) "CAPS" },
+            { GLFW_KEY_SCROLL_LOCK, (char*) "SCLK" },
+            { GLFW_KEY_NUM_LOCK, (char*) "NMLK" },
+            { GLFW_KEY_PRINT_SCREEN, (char*) "PRSC" },
+            { GLFW_KEY_PAUSE, (char*) "PAUS" },
+            { GLFW_KEY_F1, (char*) "FK01" },
+            { GLFW_KEY_F2, (char*) "FK02" },
+            { GLFW_KEY_F3, (char*) "FK03" },
+            { GLFW_KEY_F4, (char*) "FK04" },
+            { GLFW_KEY_F5, (char*) "FK05" },
+            { GLFW_KEY_F6, (char*) "FK06" },
+            { GLFW_KEY_F7, (char*) "FK07" },
+            { GLFW_KEY_F8, (char*) "FK08" },
+            { GLFW_KEY_F9, (char*) "FK09" },
+            { GLFW_KEY_F10, (char*) "FK10" },
+            { GLFW_KEY_F11, (char*) "FK11" },
+            { GLFW_KEY_F12, (char*) "FK12" },
+            { GLFW_KEY_F13, (char*) "FK13" },
+            { GLFW_KEY_F14, (char*) "FK14" },
+            { GLFW_KEY_F15, (char*) "FK15" },
+            { GLFW_KEY_F16, (char*) "FK16" },
+            { GLFW_KEY_F17, (char*) "FK17" },
+            { GLFW_KEY_F18, (char*) "FK18" },
+            { GLFW_KEY_F19, (char*) "FK19" },
+            { GLFW_KEY_F20, (char*) "FK20" },
+            { GLFW_KEY_F21, (char*) "FK21" },
+            { GLFW_KEY_F22, (char*) "FK22" },
+            { GLFW_KEY_F23, (char*) "FK23" },
+            { GLFW_KEY_F24, (char*) "FK24" },
+            { GLFW_KEY_F25, (char*) "FK25" },
+            { GLFW_KEY_KP_0, (char*) "KP0" },
+            { GLFW_KEY_KP_1, (char*) "KP1" },
+            { GLFW_KEY_KP_2, (char*) "KP2" },
+            { GLFW_KEY_KP_3, (char*) "KP3" },
+            { GLFW_KEY_KP_4, (char*) "KP4" },
+            { GLFW_KEY_KP_5, (char*) "KP5" },
+            { GLFW_KEY_KP_6, (char*) "KP6" },
+            { GLFW_KEY_KP_7, (char*) "KP7" },
+            { GLFW_KEY_KP_8, (char*) "KP8" },
+            { GLFW_KEY_KP_9, (char*) "KP9" },
+            { GLFW_KEY_KP_DECIMAL, (char*) "KPDL" },
+            { GLFW_KEY_KP_DIVIDE, (char*) "KPDV" },
+            { GLFW_KEY_KP_MULTIPLY, (char*) "KPMU" },
+            { GLFW_KEY_KP_SUBTRACT, (char*) "KPSU" },
+            { GLFW_KEY_KP_ADD, (char*) "KPAD" },
+            { GLFW_KEY_KP_ENTER, (char*) "KPEN" },
+            { GLFW_KEY_KP_EQUAL, (char*) "KPEQ" },
+            { GLFW_KEY_LEFT_SHIFT, (char*) "LFSH" },
+            { GLFW_KEY_LEFT_CONTROL, (char*) "LCTL" },
+            { GLFW_KEY_LEFT_ALT, (char*) "LALT" },
+            { GLFW_KEY_LEFT_SUPER, (char*) "LWIN" },
+            { GLFW_KEY_RIGHT_SHIFT, (char*) "RTSH" },
+            { GLFW_KEY_RIGHT_CONTROL, (char*) "RCTL" },
+            { GLFW_KEY_RIGHT_ALT, (char*) "RALT" },
+            { GLFW_KEY_RIGHT_ALT, (char*) "LVL3" },
+            { GLFW_KEY_RIGHT_ALT, (char*) "MDSW" },
+            { GLFW_KEY_RIGHT_SUPER, (char*) "RWIN" },
+            { GLFW_KEY_MENU, (char*) "MENU" }
         };
 
         // Find the X11 key code -> GLFW key code mapping