diff --git a/configure.ac b/configure.ac
index 10898c110c8e..f9138d39821e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -892,11 +892,17 @@ case $host in
            export PKG_CONFIG_PATH="$($BREW --prefix qt@5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
          fi
 
-         gmp_prefix=$($BREW --prefix gmp 2>/dev/null)
-         if test "$gmp_prefix" != ""; then
-           CORE_CPPFLAGS="$CORE_CPPFLAGS -I$gmp_prefix/include"
-           CORE_LDFLAGS="$CORE_LDFLAGS -L$gmp_prefix/lib"
-         fi
+        gmp_prefix=$($BREW --prefix gmp 2>/dev/null)
+        if test "$gmp_prefix" != ""; then
+          if test "$suppress_external_warnings" != "no"; then
+            GMP_CPPFLAGS="-isystem $gmp_prefix/include"
+          else
+            GMP_CPPFLAGS="-I$gmp_prefix/include"
+          fi
+          GMP_LDFLAGS="-L$gmp_prefix/lib"
+          CORE_CPPFLAGS="$CORE_CPPFLAGS $GMP_CPPFLAGS"
+          CORE_LDFLAGS="$CORE_LDFLAGS $GMP_LDFLAGS"
+        fi
 
          case $host in
            *aarch64*)
@@ -1669,8 +1675,14 @@ if test "$use_zmq" = "yes"; then
 fi
 
 dnl check if libgmp is present
+TEMP_CPPFLAGS="$CPPFLAGS"
+TEMP_LDFLAGS="$LDFLAGS"
+CPPFLAGS="$CPPFLAGS $GMP_CPPFLAGS"
+LDFLAGS="$LDFLAGS $GMP_LDFLAGS"
 AC_CHECK_HEADER([gmp.h],, AC_MSG_ERROR(libgmp headers missing))
 AC_CHECK_LIB([gmp],  [__gmpz_init],GMP_LIBS=-lgmp, AC_MSG_ERROR(libgmp missing))
+CPPFLAGS="$TEMP_CPPFLAGS"
+LDFLAGS="$TEMP_LDFLAGS"
 
 AM_CONDITIONAL([ENABLE_ZMQ], [test "$use_zmq" = "yes"])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 9721e8e4f35e..bdfc08ce3662 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -892,7 +892,7 @@ libbitcoin_consensus_a_SOURCES = \
   version.h
 
 # common: shared between dashd, and dash-qt and non-server tools
-libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
+libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS)
 libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_common_a_SOURCES = \
   base58.cpp \