diff --git a/src/wl_init.c b/src/wl_init.c
index 3e1e3faa..df760524 100644
--- a/src/wl_init.c
+++ b/src/wl_init.c
@@ -48,7 +48,8 @@ static void wmBaseHandlePing(void* userData,
     xdg_wm_base_pong(wmBase, serial);
 }
 
-static const struct xdg_wm_base_listener wmBaseListener = {
+static const struct xdg_wm_base_listener wmBaseListener =
+{
     wmBaseHandlePing
 };
 
@@ -164,7 +165,8 @@ static void registryHandleGlobalRemove(void* userData,
 }
 
 
-static const struct wl_registry_listener registryListener = {
+static const struct wl_registry_listener registryListener =
+{
     registryHandleGlobal,
     registryHandleGlobalRemove
 };
diff --git a/src/wl_monitor.c b/src/wl_monitor.c
index f4009c34..3c2ebc55 100644
--- a/src/wl_monitor.c
+++ b/src/wl_monitor.c
@@ -106,7 +106,8 @@ static void outputHandleScale(void* userData,
     monitor->wl.scale = factor;
 }
 
-static const struct wl_output_listener outputListener = {
+static const struct wl_output_listener outputListener =
+{
     outputHandleGeometry,
     outputHandleMode,
     outputHandleDone,
diff --git a/src/wl_window.c b/src/wl_window.c
index 031943b7..ab274996 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -392,7 +392,8 @@ static void xdgDecorationHandleConfigure(void* userData,
         createDecorations(window);
 }
 
-static const struct zxdg_toplevel_decoration_v1_listener xdgDecorationListener = {
+static const struct zxdg_toplevel_decoration_v1_listener xdgDecorationListener =
+{
     xdgDecorationHandleConfigure,
 };
 
@@ -676,7 +677,8 @@ static void xdgToplevelHandleClose(void* userData,
     _glfwInputWindowCloseRequest(window);
 }
 
-static const struct xdg_toplevel_listener xdgToplevelListener = {
+static const struct xdg_toplevel_listener xdgToplevelListener =
+{
     xdgToplevelHandleConfigure,
     xdgToplevelHandleClose
 };
@@ -1349,7 +1351,8 @@ static void pointerHandleAxis(void* userData,
     _glfwInputScroll(window, x, y);
 }
 
-static const struct wl_pointer_listener pointerListener = {
+static const struct wl_pointer_listener pointerListener =
+{
     pointerHandleEnter,
     pointerHandleLeave,
     pointerHandleMotion,
@@ -1643,7 +1646,8 @@ static void keyboardHandleRepeatInfo(void* userData,
 }
 #endif
 
-static const struct wl_keyboard_listener keyboardListener = {
+static const struct wl_keyboard_listener keyboardListener =
+{
     keyboardHandleKeymap,
     keyboardHandleEnter,
     keyboardHandleLeave,
@@ -1687,7 +1691,8 @@ static void seatHandleName(void* userData,
 {
 }
 
-static const struct wl_seat_listener seatListener = {
+static const struct wl_seat_listener seatListener =
+{
     seatHandleCapabilities,
     seatHandleName,
 };
@@ -1708,8 +1713,9 @@ static void dataOfferHandleOffer(void* userData,
     }
 }
 
-static const struct wl_data_offer_listener dataOfferListener = {
-    dataOfferHandleOffer,
+static const struct wl_data_offer_listener dataOfferListener =
+{
+    dataOfferHandleOffer
 };
 
 static void dataDeviceHandleDataOffer(void* userData,
@@ -1798,7 +1804,8 @@ static void dataDeviceHandleSelection(void* userData,
     }
 }
 
-static const struct wl_data_device_listener dataDeviceListener = {
+const struct wl_data_device_listener dataDeviceListener =
+{
     dataDeviceHandleDataOffer,
     dataDeviceHandleEnter,
     dataDeviceHandleLeave,
@@ -2415,7 +2422,8 @@ static void relativePointerHandleRelativeMotion(void* userData,
     _glfwInputCursorPos(window, xpos, ypos);
 }
 
-static const struct zwp_relative_pointer_v1_listener relativePointerListener = {
+static const struct zwp_relative_pointer_v1_listener relativePointerListener =
+{
     relativePointerHandleRelativeMotion
 };
 
@@ -2445,7 +2453,8 @@ static void lockedPointerHandleUnlocked(void* userData,
 {
 }
 
-static const struct zwp_locked_pointer_v1_listener lockedPointerListener = {
+static const struct zwp_locked_pointer_v1_listener lockedPointerListener =
+{
     lockedPointerHandleLocked,
     lockedPointerHandleUnlocked
 };
@@ -2612,7 +2621,8 @@ static void dataSourceHandleCancelled(void* userData,
     _glfw.wl.selectionSource = NULL;
 }
 
-static const struct wl_data_source_listener dataSourceListener = {
+static const struct wl_data_source_listener dataSourceListener =
+{
     dataSourceHandleTarget,
     dataSourceHandleSend,
     dataSourceHandleCancelled,