diff --git a/config.h.in b/config.h.in
index 670472e0aa..cb7cad0c2c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -33,18 +33,9 @@
 /* Define to 1 if you have <boost/unordered_map.hpp> */
 #undef HAVE_BOOST_UNORDERED_MAP_HPP
 
-/* Define to 1 if you have <boost/unordered_set.hpp> */
-#undef HAVE_BOOST_UNORDERED_SET_HPP
-
-/* Define to 1 if you have <boost/uuid/uuid_generators.hpp> */
-#undef HAVE_BOOST_UUID_UUID_GENERATORS_HPP
-
 /* Define to 1 if you have <boost/uuid/uuid.hpp> */
 #undef HAVE_BOOST_UUID_UUID_HPP
 
-/* Define to 1 if you have <boost/uuid/uuid_io.hpp> */
-#undef HAVE_BOOST_UUID_UUID_IO_HPP
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
diff --git a/m4/boost.m4 b/m4/boost.m4
index 8bc0495514..c6b3cd8cf7 100644
--- a/m4/boost.m4
+++ b/m4/boost.m4
@@ -630,22 +630,17 @@ BOOST_DEFUN([Preprocessor],
 
 
 # BOOST_UNORDERED()
-# ------------
+# -----------------
 # Look for Boost.Unordered
 BOOST_DEFUN([Unordered],
-[BOOST_FIND_HEADER([boost/unordered_map.hpp])
-BOOST_FIND_HEADER([boost/unordered_set.hpp])
-])# BOOST_UNORDERED
+[BOOST_FIND_HEADER([boost/unordered_map.hpp])])
 
 
 # BOOST_UUID()
 # ------------
 # Look for Boost.Uuid
 BOOST_DEFUN([Uuid],
-[BOOST_FIND_HEADER([boost/uuid/uuid.hpp])
-BOOST_FIND_HEADER([boost/uuid/uuid_generators.hpp])
-BOOST_FIND_HEADER([boost/uuid/uuid_io.hpp])
-])# BOOST_UUID
+[BOOST_FIND_HEADER([boost/uuid/uuid.hpp])])
 
 
 # BOOST_PROGRAM_OPTIONS([PREFERRED-RT-OPT])