diff --git a/src/gallium/auxiliary/util/u_inlines.h b/src/gallium/auxiliary/util/u_inlines.h
index c20e90e45ba..e79e977a441 100644
--- a/src/gallium/auxiliary/util/u_inlines.h
+++ b/src/gallium/auxiliary/util/u_inlines.h
@@ -33,6 +33,7 @@
 #include "pipe/p_shader_tokens.h"
 #include "pipe/p_state.h"
 #include "pipe/p_screen.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_debug_describe.h"
 #include "util/u_debug_refcnt.h"
@@ -708,7 +709,7 @@ util_max_layer(const struct pipe_resource *r, unsigned level)
       return u_minify(r->depth0, level) - 1;
    case PIPE_TEXTURE_CUBE:
       assert(r->array_size == 6);
-      /* fall-through */
+      FALLTHROUGH;
    case PIPE_TEXTURE_1D_ARRAY:
    case PIPE_TEXTURE_2D_ARRAY:
    case PIPE_TEXTURE_CUBE_ARRAY:
diff --git a/src/gallium/auxiliary/util/u_prim.h b/src/gallium/auxiliary/util/u_prim.h
index b4c06df01e0..b9d4a9e80f2 100644
--- a/src/gallium/auxiliary/util/u_prim.h
+++ b/src/gallium/auxiliary/util/u_prim.h
@@ -31,6 +31,7 @@
 
 
 #include "pipe/p_defines.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #ifdef __cplusplus
@@ -277,7 +278,7 @@ u_reduced_prims_for_vertices(enum pipe_prim_type primitive, int vertices)
       return u_decomposed_prims_for_vertices(primitive, vertices) * 2;
    case PIPE_PRIM_POLYGON:
       primitive = PIPE_PRIM_TRIANGLE_FAN;
-      /* fall through */
+      FALLTHROUGH;
    default:
       return u_decomposed_prims_for_vertices(primitive, vertices);
    }
diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h
index ae124bdb968..34d1c49d9de 100644
--- a/src/gallium/drivers/radeon/radeon_winsys.h
+++ b/src/gallium/drivers/radeon/radeon_winsys.h
@@ -817,6 +817,7 @@ static inline unsigned radeon_flags_from_heap(enum radeon_heap heap)
    case RADEON_HEAP_GTT_UNCACHED_WC_READ_ONLY_32BIT:
    case RADEON_HEAP_GTT_UNCACHED_WC_32BIT:
       flags |= RADEON_FLAG_32BIT;
+      FALLTHROUGH;
    default:
       break;
    }
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c b/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
index 5313e177e4c..1b3acf13b0c 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
@@ -34,7 +34,7 @@ static int amdgpu_surface_sanity(const struct pipe_resource *tex)
    case PIPE_TEXTURE_1D:
       if (tex->height0 > 1)
          return -EINVAL;
-      /* fall through */
+      FALLTHROUGH;
    case PIPE_TEXTURE_2D:
    case PIPE_TEXTURE_RECT:
       if (tex->depth0 > 1 || tex->array_size > 1)
@@ -47,7 +47,7 @@ static int amdgpu_surface_sanity(const struct pipe_resource *tex)
    case PIPE_TEXTURE_1D_ARRAY:
       if (tex->height0 > 1)
          return -EINVAL;
-      /* fall through */
+      FALLTHROUGH;
    case PIPE_TEXTURE_CUBE:
    case PIPE_TEXTURE_2D_ARRAY:
    case PIPE_TEXTURE_CUBE_ARRAY: