diff --git a/CMakeLists.txt b/CMakeLists.txt
index 128c5ff4..e42c9cdc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,9 +59,7 @@ option(EXTERNAL_PROTOZERO "Do not use the bundled protozero" OFF)
 # Detect available headers and set global compiler options
 #############################################################
 
-include (CheckIncludeFiles)
-include (CheckFunctionExists)
-include (CheckTypeSize)
+include(CheckIncludeFiles)
 
 add_definitions( -DDEFAULT_STYLE=\"${DEFAULT_STYLE}\" )
 
@@ -97,12 +95,7 @@ if (WITH_LUA)
   set(HAVE_LUA 1)
 endif()
 
-if (NOT Boost_ADDITIONAL_VERSIONS)
-  set(Boost_ADDITIONAL_VERSIONS "1.55;1.56;1.57;1.58;1.59;1.60;1.61")
-endif()
-
-# first try to find the version
-find_package(Boost 1.50 REQUIRED COMPONENTS system filesystem ${BOOST_EXTRA})
+find_package(Boost 1.50 REQUIRED COMPONENTS system filesystem)
 include_directories(SYSTEM ${Boost_INCLUDE_DIR})
 
 find_package(PostgreSQL REQUIRED)
diff --git a/cmake/config.h.in b/cmake/config.h.in
index 2f443c94..7a7844be 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -1,33 +1,5 @@
-#cmakedefine HAVE_LSEEK64 1
 #cmakedefine HAVE_LUA 1
 #cmakedefine HAVE_LUAJIT 1
-#cmakedefine HAVE_POSIX_FADVISE 1
-#cmakedefine HAVE_POSIX_FALLOCATE 1
-#cmakedefine HAVE_SYNC_FILE_RANGE 1
 #cmakedefine HAVE_TERMIOS_H 1
-#cmakedefine HAVE_LIBGEN_H 1
-#cmakedefine SIZEOF_OFF_T ${SIZEOF_OFF_T}
-
-#ifdef _MSC_VER
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-#endif
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
 
 #define VERSION "@PACKAGE_VERSION@"