diff --git a/bricks/brick-hash.h b/bricks/brick-hash.h
index 8243ebdb4..8128f2131 100644
--- a/bricks/brick-hash.h
+++ b/bricks/brick-hash.h
@@ -29,6 +29,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE. */
 
+#include <spot/misc/common.hh>
+
 #include <bricks/brick-assert.h>
 
 #include <cstddef>
@@ -572,37 +574,48 @@ private:
         switch (remainder)
         {
         case 15:
-        d += uint64( u.p8[14] ) << 48;
+            d += uint64( u.p8[14] ) << 48;
+            SPOT_FALLTHROUGH;
         case 14:
             d += uint64( u.p8[13] ) << 40;
+            SPOT_FALLTHROUGH;
         case 13:
             d += uint64( u.p8[12] ) << 32;
+            SPOT_FALLTHROUGH;
         case 12:
             d += u.p32[2];
             c += u.p64[0];
             break;
         case 11:
             d += uint64( u.p8[10] ) << 16;
+            SPOT_FALLTHROUGH;
         case 10:
             d += uint64( u.p8[9] ) << 8;
+            SPOT_FALLTHROUGH;
         case 9:
             d += uint64( u.p8[8] );
+            SPOT_FALLTHROUGH;
         case 8:
             c += u.p64[0];
             break;
         case 7:
             c += uint64(u.p8[6] ) << 48;
+            SPOT_FALLTHROUGH;
         case 6:
             c += uint64( u.p8[5] ) << 40;
+            SPOT_FALLTHROUGH;
         case 5:
             c += uint64( u.p8[4] ) << 32;
+            SPOT_FALLTHROUGH;
         case 4:
             c += u.p32[0];
             break;
         case 3:
             c += uint64( u.p8[2] ) << 16;
+            SPOT_FALLTHROUGH;
         case 2:
             c += uint64( u.p8[1] ) << 8;
+            SPOT_FALLTHROUGH;
         case 1:
             c += uint64( u.p8[0] );
             break;
diff --git a/bricks/brick-hashset.h b/bricks/brick-hashset.h
index f34519112..30cdbb460 100644
--- a/bricks/brick-hashset.h
+++ b/bricks/brick-hashset.h
@@ -32,6 +32,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE. */
 
+#include <spot/misc/common.hh>
+
 #include <bricks/brick-hash.h>
 #include <bricks/brick-shmem.h>
 #include <bricks/brick-bitlevel.h>
@@ -636,6 +638,7 @@ struct _ConcurrentHashSet : HashSetBase< Cell >
                             ++_td.currentRow;
                             break;
                         }
+                        SPOT_FALLTHROUGH;
                     case Resolution::Growing:
                         helpWithRehashing();
                         updateIndex( _td.currentRow );