diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 2d7e4d4ea..01435f5b5 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -38,21 +38,9 @@ else()
 endif()
 
 # Set up the config.h file.
-set(PACKAGE_NAME "fish")
-set(PACKAGE_TARNAME "fish")
 include(CheckCXXSymbolExists)
-include(CheckCXXSourceCompiles)
 include(CheckTypeSize)
 
 check_cxx_symbol_exists(gettext libintl.h HAVE_GETTEXT)
 
 check_type_size("wchar_t[8]" WCHAR_T_BITS LANGUAGE CXX)
-
-# Work around the fact that cmake does not propagate the language standard flag into
-# the CHECK_CXX_SOURCE_COMPILES function. See CMake issue #16456.
-# Ensure we do this after the FIND_PACKAGE calls which use C, and will error on a C++
-# standards flag.
-# Also see https://github.com/fish-shell/fish-shell/issues/5865
-if(NOT POLICY CMP0067)
-  list(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_STANDARD}_EXTENSION_COMPILE_OPTION}")
-endif()
diff --git a/cmake/gettext.cmake b/cmake/gettext.cmake
index 7b06d6c6e..465b7cbcc 100644
--- a/cmake/gettext.cmake
+++ b/cmake/gettext.cmake
@@ -43,14 +43,3 @@ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${Intl_LIBRARIES})
 if(Intl_FOUND AND Intl_LIBRARIES)
   set(LIBINTL_INCLUDE "#include <libintl.h>")
 endif()
-check_cxx_source_compiles("
-${LIBINTL_INCLUDE}
-#include <stdlib.h>
-int main () {
-    extern int  _nl_msg_cat_cntr;
-    int tmp = _nl_msg_cat_cntr;
-    exit(tmp);
-}
-"
-    HAVE__NL_MSG_CAT_CNTR)
-cmake_pop_check_state()