diff --git a/configure b/configure
index 34e4997..79e649f 100755
--- a/configure
+++ b/configure
@@ -16895,6 +16895,7 @@ $as_echo_n "checking thread support... " >&6; }
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <thread>
+#include <memory>
                          std::shared_ptr<std::thread> th;
 int
 main ()
diff --git a/m4macros/ax_cpp11.m4 b/m4macros/ax_cpp11.m4
index f9042fa..99457f9 100644
--- a/m4macros/ax_cpp11.m4
+++ b/m4macros/ax_cpp11.m4
@@ -182,6 +182,7 @@ for retry in "none" "--std=c++11" "--std=c++0x" "--std=c++1x" "fail"; do
         AC_COMPILE_IFELSE(
                 [AC_LANG_PROGRAM(
                         [#include <thread>
+                         #include <memory>
                          std::shared_ptr<std::thread> th;],
                         [th.reset(new std::thread([[]]() { return; }));
                          th->join();])],
diff --git a/src/lib/database/backend_selector.cc b/src/lib/database/backend_selector.cc
index 0f61fe8..adb95d6 100644
--- a/src/lib/database/backend_selector.cc
+++ b/src/lib/database/backend_selector.cc
@@ -9,6 +9,7 @@
 #include <database/backend_selector.h>
 #include <exceptions/exceptions.h>
 #include <climits>
+#include <limits>
 #include <sstream>
 
 using namespace isc::data;
diff --git a/src/lib/dhcpsrv/cfg_hosts_util.cc b/src/lib/dhcpsrv/cfg_hosts_util.cc
index 11c9e87..b5eab53 100644
--- a/src/lib/dhcpsrv/cfg_hosts_util.cc
+++ b/src/lib/dhcpsrv/cfg_hosts_util.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+#include <limits>
 
 #include <cc/data.h>
 #include <dhcpsrv/subnet_id.h>
diff --git a/src/lib/dhcpsrv/network_state.cc b/src/lib/dhcpsrv/network_state.cc
index 61199ab..ceaba8c 100644
--- a/src/lib/dhcpsrv/network_state.cc
+++ b/src/lib/dhcpsrv/network_state.cc
@@ -6,6 +6,7 @@
 
 #include <config.h>
 
+#include <limits>
 #include <exceptions/exceptions.h>
 #include <dhcpsrv/network_state.h>
 #include <dhcpsrv/timer_mgr.h>