diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index dab5968e8f9..b5a25dcc076 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -197,7 +197,7 @@ const __DRIbackgroundCallableExtension background_callable_extension = {
 };
 
 const __DRIuseInvalidateExtension use_invalidate = {
-   .base = { __DRI_USE_INVALIDATE, 1 }
+   .base = { __DRI_USE_INVALIDATE, 1 },
 };
 
 static void
@@ -3197,7 +3197,7 @@ dri2_bind_wayland_display_wl(_EGLDisplay *disp, struct wl_display *wl_dpy)
       .authenticate = (int(*)(void *, uint32_t)) dri2_dpy->vtbl->authenticate,
       .reference_buffer = dri2_wl_reference_buffer,
       .release_buffer = dri2_wl_release_buffer,
-      .is_format_supported = dri2_wl_is_format_supported
+      .is_format_supported = dri2_wl_is_format_supported,
    };
    int flags = 0;
    char *device_name;
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 60c7ef5bc33..e0fd45a1241 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -1316,7 +1316,7 @@ droid_add_configs_for_visuals(_EGLDisplay *disp)
            EGL_NATIVE_VISUAL_TYPE, visuals[i].format,
            EGL_FRAMEBUFFER_TARGET_ANDROID, EGL_TRUE,
            EGL_RECORDABLE_ANDROID, EGL_TRUE,
-           EGL_NONE
+           EGL_NONE,
          };
 
          struct dri2_egl_config *dri2_conf =
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index d6dfd007597..5fcbcf5e5e4 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -266,7 +266,7 @@ wl_buffer_release(void *data, struct wl_buffer *buffer)
 }
 
 static const struct wl_buffer_listener wl_buffer_listener = {
-   .release = wl_buffer_release
+   .release = wl_buffer_release,
 };
 
 static void
@@ -1836,7 +1836,7 @@ static const struct wl_drm_listener drm_listener = {
    .device = drm_handle_device,
    .format = drm_handle_format,
    .authenticated = drm_handle_authenticated,
-   .capabilities = drm_handle_capabilities
+   .capabilities = drm_handle_capabilities,
 };
 
 static void
@@ -2031,7 +2031,7 @@ registry_handle_global_remove(void *data, struct wl_registry *registry,
 
 static const struct wl_registry_listener registry_listener_drm = {
    .global = registry_handle_global_drm,
-   .global_remove = registry_handle_global_remove
+   .global_remove = registry_handle_global_remove,
 };
 
 static void
@@ -2688,7 +2688,7 @@ shm_handle_format(void *data, struct wl_shm *shm, uint32_t format)
 }
 
 static const struct wl_shm_listener shm_listener = {
-   .format = shm_handle_format
+   .format = shm_handle_format,
 };
 
 static void
@@ -2707,7 +2707,7 @@ registry_handle_global_swrast(void *data, struct wl_registry *registry,
 
 static const struct wl_registry_listener registry_listener_swrast = {
    .global = registry_handle_global_swrast,
-   .global_remove = registry_handle_global_remove
+   .global_remove = registry_handle_global_remove,
 };
 
 static const struct dri2_egl_display_vtbl dri2_wl_swrast_display_vtbl = {
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index f2fb0231433..bfeea2d0c44 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -811,7 +811,7 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display *dri2_dpy,
             const EGLint config_attrs[] = {
                     EGL_NATIVE_VISUAL_ID,    visuals[i].visual_id,
                     EGL_NATIVE_VISUAL_TYPE,  visuals[i]._class,
-                    EGL_NONE
+                    EGL_NONE,
             };
 
             int rgba_shifts[4] = {
diff --git a/src/egl/main/eglcurrent.c b/src/egl/main/eglcurrent.c
index 249f2a410f7..a1f28713b6c 100644
--- a/src/egl/main/eglcurrent.c
+++ b/src/egl/main/eglcurrent.c
@@ -40,7 +40,7 @@
 #include "eglglobals.h"
 
 static __THREAD_INITIAL_EXEC _EGLThreadInfo _egl_TLS = {
-   .inited = false
+   .inited = false,
 };
 
 static void
diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c
index 29558ea910e..4b15657c288 100644
--- a/src/egl/wayland/wayland-drm/wayland-drm.c
+++ b/src/egl/wayland/wayland-drm/wayland-drm.c
@@ -193,7 +193,7 @@ static const struct wl_drm_interface drm_interface = {
 	drm_authenticate,
 	drm_create_buffer,
         drm_create_planar_buffer,
-        drm_create_prime_buffer
+        drm_create_prime_buffer,
 };
 
 static void