diff --git a/source/modules/dgl/src/Window.cpp b/source/modules/dgl/src/Window.cpp
index 626264400..903de840f 100644
--- a/source/modules/dgl/src/Window.cpp
+++ b/source/modules/dgl/src/Window.cpp
@@ -25,6 +25,11 @@
 
 #include "pugl/pugl.h"
 
+#if defined(__GNUC__) && (__GNUC__ >= 6)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
+
 #if defined(DISTRHO_OS_WINDOWS)
 # include "pugl/pugl_win.cpp"
 #elif defined(DISTRHO_OS_MAC)
@@ -39,6 +44,10 @@ extern "C" {
 # error Unsupported platform
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ >= 6)
+# pragma GCC diagnostic pop
+#endif
+
 #include "ApplicationPrivateData.hpp"
 #include "WidgetPrivateData.hpp"
 #include "../StandaloneWindow.hpp"
diff --git a/source/modules/juce_core/native/juce_linux_Files.cpp b/source/modules/juce_core/native/juce_linux_Files.cpp
index d022175a6..1edbfe8d6 100644
--- a/source/modules/juce_core/native/juce_linux_Files.cpp
+++ b/source/modules/juce_core/native/juce_linux_Files.cpp
@@ -136,14 +136,14 @@ File File::getSpecialLocation (const SpecialLocationType type)
         case invokedExecutableFile:
             if (juce_argv != nullptr && juce_argc > 0)
                 return File (CharPointer_UTF8 (juce_argv[0]));
-            // deliberate fall-through...
+            // fall-through
 
         case currentExecutableFile:
         case currentApplicationFile:
            #if ! JUCE_STANDALONE_APPLICATION
             return juce_getExecutableFile();
            #endif
-            // deliberate fall-through if this is not a shared-library
+            // fall-through
 
         case hostApplicationPath:
         {
diff --git a/source/modules/juce_core/xml/juce_XmlElement.cpp b/source/modules/juce_core/xml/juce_XmlElement.cpp
index b04e30728..5c86674d5 100644
--- a/source/modules/juce_core/xml/juce_XmlElement.cpp
+++ b/source/modules/juce_core/xml/juce_XmlElement.cpp
@@ -241,7 +241,7 @@ namespace XmlOutputFunctions
                         outputStream << (char) character;
                         break;
                     }
-                    // Note: deliberate fall-through here!
+                    // fall-through
                 default:
                     outputStream << "&#" << ((int) character) << ';';
                     break;
diff --git a/source/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp b/source/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
index df64f23d2..45087c6aa 100644
--- a/source/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
+++ b/source/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
@@ -92,7 +92,7 @@ private:
             {
                 case Z_STREAM_END:
                     finished = true;
-                    // Deliberate fall-through..
+                    // fall-through..
                 case Z_OK:
                 {
                     data += dataSize - stream.avail_in;
diff --git a/source/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp b/source/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
index fa79c4983..00369b423 100644
--- a/source/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
+++ b/source/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
@@ -141,7 +141,7 @@ public:
             {
             case Z_STREAM_END:
                 finished = true;
-                // deliberate fall-through
+                // fall-through
             case Z_OK:
                 data += dataSize - stream.avail_in;
                 dataSize = (z_uInt) stream.avail_in;
diff --git a/source/native-plugins/zynaddsubfx/rtosc/rtosc.c b/source/native-plugins/zynaddsubfx/rtosc/rtosc.c
index cc73cf41a..1dd34cf79 100644
--- a/source/native-plugins/zynaddsubfx/rtosc/rtosc.c
+++ b/source/native-plugins/zynaddsubfx/rtosc/rtosc.c
@@ -232,8 +232,7 @@ static size_t vsosc_null(const char        *address,
     return pos;
 }
 
-static const rtosc_cmp_options* default_cmp_options
- = &((rtosc_cmp_options) { 0.0 });
+static const rtosc_cmp_options default_cmp_options({ 0.0 });
 
 int rtosc_arg_vals_eq(rtosc_arg_val_t* lhs, rtosc_arg_val_t* rhs,
                       size_t lsize, size_t rsize,
@@ -242,7 +241,7 @@ int rtosc_arg_vals_eq(rtosc_arg_val_t* lhs, rtosc_arg_val_t* rhs,
 #define mfabs(val) (((val) >= 0) ? (val) : -(val))
 
     if(!opt)
-        opt = default_cmp_options;
+        opt = &default_cmp_options;
     if(lsize != rsize)
         return 0;
 
@@ -319,7 +318,7 @@ int rtosc_arg_vals_cmp(rtosc_arg_val_t* lhs, rtosc_arg_val_t* rhs,
 #define mfabs(val) (((val) >= 0) ? (val) : -(val))
 
     if(!opt)
-        opt = default_cmp_options;
+        opt = &default_cmp_options;
 
     size_t rval = 0;
     size_t min = lsize > rsize ? rsize : lsize;