diff --git a/src/xml/conference-info.cpp b/src/xml/conference-info.cpp
index f887efce2..59f648483 100644
--- a/src/xml/conference-info.cpp
+++ b/src/xml/conference-info.cpp
@@ -43,6 +43,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -9334,6 +9338,9 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/conference-info.h b/src/xml/conference-info.h
index 9925b5539..e9c315fd5 100644
--- a/src/xml/conference-info.h
+++ b/src/xml/conference-info.h
@@ -58,6 +58,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -3904,6 +3908,9 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/epilogue.txt b/src/xml/epilogue.txt
index b4e4ec06e..faa93c2e5 100644
--- a/src/xml/epilogue.txt
+++ b/src/xml/epilogue.txt
@@ -1,3 +1,6 @@
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/imdn.cpp b/src/xml/imdn.cpp
index ade5553fb..653fa2604 100644
--- a/src/xml/imdn.cpp
+++ b/src/xml/imdn.cpp
@@ -43,6 +43,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -3431,6 +3435,9 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/imdn.h b/src/xml/imdn.h
index 81c5a9ed3..ca544a67c 100644
--- a/src/xml/imdn.h
+++ b/src/xml/imdn.h
@@ -58,6 +58,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -1720,6 +1724,9 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/is-composing.cpp b/src/xml/is-composing.cpp
index 0f6ab0e78..ced754a84 100644
--- a/src/xml/is-composing.cpp
+++ b/src/xml/is-composing.cpp
@@ -43,6 +43,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -953,6 +957,9 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/is-composing.h b/src/xml/is-composing.h
index b6ca96359..a19585c91 100644
--- a/src/xml/is-composing.h
+++ b/src/xml/is-composing.h
@@ -58,6 +58,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -668,6 +672,9 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/linphone-imdn.cpp b/src/xml/linphone-imdn.cpp
index e1e4a7934..5f064f1a5 100644
--- a/src/xml/linphone-imdn.cpp
+++ b/src/xml/linphone-imdn.cpp
@@ -43,6 +43,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -708,6 +712,9 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/linphone-imdn.h b/src/xml/linphone-imdn.h
index 940553cfc..ea7478f60 100644
--- a/src/xml/linphone-imdn.h
+++ b/src/xml/linphone-imdn.h
@@ -58,6 +58,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -582,6 +586,9 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/prologue.txt b/src/xml/prologue.txt
index 410500a6d..2349b5d94 100644
--- a/src/xml/prologue.txt
+++ b/src/xml/prologue.txt
@@ -8,3 +8,7 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
diff --git a/src/xml/resource-lists.cpp b/src/xml/resource-lists.cpp
index fffeacbd8..d74589fde 100644
--- a/src/xml/resource-lists.cpp
+++ b/src/xml/resource-lists.cpp
@@ -43,6 +43,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -2513,6 +2517,9 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/resource-lists.h b/src/xml/resource-lists.h
index ecb0de126..b2384df98 100644
--- a/src/xml/resource-lists.h
+++ b/src/xml/resource-lists.h
@@ -58,6 +58,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -1296,6 +1300,9 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 2d76282c4..7c5162e3d 100644
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -43,6 +43,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -483,6 +487,9 @@ namespace namespace_
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/xml.h b/src/xml/xml.h
index 14790ba3f..c05ea2029 100644
--- a/src/xml/xml.h
+++ b/src/xml/xml.h
@@ -58,6 +58,10 @@
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
 //
 // End prologue.
 
@@ -515,6 +519,9 @@ namespace namespace_
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
 	#pragma GCC diagnostic pop
 #endif