diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2900de9b7c..af526ed72d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -411,7 +411,7 @@ main(void)
   return MSGPACK_OBJECT_FLOAT32;
 }
 " MSGPACK_HAS_FLOAT32)
-unset(CMAKE_REQUIRED_LIBRARIES)
+list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${MSGPACK_INCLUDE_DIRS}")
 if(MSGPACK_HAS_FLOAT32)
   add_definitions(-DNVIM_MSGPACK_HAS_FLOAT32)
 endif()
@@ -433,8 +433,8 @@ if(FEAT_TUI)
     return unibi_num_from_var(unibi_var_from_num(0));
   }
   " UNIBI_HAS_VAR_FROM)
-  unset(CMAKE_REQUIRED_INCLUDES)
-  unset(CMAKE_REQUIRED_LIBRARIES)
+  list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${UNIBILIUM_INCLUDE_DIRS}")
+  list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${UNIBILIUM_LIBRARIES}")
   if(UNIBI_HAS_VAR_FROM)
     add_definitions(-DNVIM_UNIBI_HAS_VAR_FROM)
   endif()
diff --git a/cmake/FindLibIntl.cmake b/cmake/FindLibIntl.cmake
index 989cb07488..5663098147 100644
--- a/cmake/FindLibIntl.cmake
+++ b/cmake/FindLibIntl.cmake
@@ -31,15 +31,13 @@ find_library(LibIntl_LIBRARY
 )
 
 if (LibIntl_INCLUDE_DIR)
-  set(CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}")
+  list(APPEND CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}")
 endif()
-
 # On some systems (linux+glibc) libintl is passively available.
 # So only specify the library if one was found.
 if (LibIntl_LIBRARY)
-  set(CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}")
+  list(APPEND CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}")
 endif()
-
 check_c_source_compiles("
 #include <libintl.h>
 
@@ -50,6 +48,12 @@ int main(int argc, char** argv) {
   bind_textdomain_codeset(\"foo\", \"bar\");
   textdomain(\"foo\");
 }" HAVE_WORKING_LIBINTL)
+if (LibIntl_INCLUDE_DIR)
+  list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}")
+endif()
+if (LibIntl_LIBRARY)
+  list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}")
+endif()
 
 if (HAVE_WORKING_LIBINTL)
   # On some systems (linux+glibc) libintl is passively available.