diff --git a/rw.cpp b/rw.cpp
index f573fc31..8e07f577 100644
--- a/rw.cpp
+++ b/rw.cpp
@@ -202,7 +202,7 @@ Integer InvertibleRWFunction::CalculateInverse(RandomNumberGenerator &rng, const
 	Integer re = modn.Square(r);
 	re = modn.Multiply(re, x);    // blind
 
-	const Integer &h = re, &p = m_p, &q = m_q, &n = m_n;
+	const Integer &h = re, &p = m_p, &q = m_q;
 	Integer e, f;
 
 	const Integer U = modq.Exponentiate(h, (q+1)/8);
diff --git a/shark.cpp b/shark.cpp
index 361147e2..69e0a69e 100644
--- a/shark.cpp
+++ b/shark.cpp
@@ -6,6 +6,10 @@
 #include "modes.h"
 #include "gf256.h"
 
+#if GCC_DIAGNOSTIC_AWARE
+# pragma GCC diagnostic ignored "-Wmissing-braces"
+#endif
+
 NAMESPACE_BEGIN(CryptoPP)
 
 static word64 SHARKTransform(word64 a)
diff --git a/sharkbox.cpp b/sharkbox.cpp
index a0ff31f8..edd33180 100644
--- a/sharkbox.cpp
+++ b/sharkbox.cpp
@@ -1,6 +1,10 @@
 #include "pch.h"
 #include "shark.h"
 
+#if GCC_DIAGNOSTIC_AWARE
+# pragma GCC diagnostic ignored "-Wmissing-braces"
+#endif
+
 NAMESPACE_BEGIN(CryptoPP)
 
 const byte SHARK::Enc::sbox[256] = {
diff --git a/square.cpp b/square.cpp
index 00e6bddb..7513be7f 100644
--- a/square.cpp
+++ b/square.cpp
@@ -6,6 +6,10 @@
 #include "misc.h"
 #include "gf256.h"
 
+#if GCC_DIAGNOSTIC_AWARE
+# pragma GCC diagnostic ignored "-Wmissing-braces"
+#endif
+
 NAMESPACE_BEGIN(CryptoPP)
 
 // apply theta to a roundkey
diff --git a/tftables.cpp b/tftables.cpp
index dc654cf0..974d143d 100644
--- a/tftables.cpp
+++ b/tftables.cpp
@@ -3,6 +3,10 @@
 #include "pch.h"
 #include "twofish.h"
 
+#if GCC_DIAGNOSTIC_AWARE
+# pragma GCC diagnostic ignored "-Wmissing-braces"
+#endif
+
 NAMESPACE_BEGIN(CryptoPP)
 
 const byte Twofish::Base::q[2][256] = {