diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82c22c121..eaf41e776 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,21 +31,6 @@ set(CMAKE_UNITY_BUILD_BATCH_SIZE 300)
 # enable symbols visibility preset for all targets
 cmake_policy(SET CMP0063 NEW)
 
-# LLVM linker does not have a default library search path, add some directories known to contain
-# system wide libraries. the headers search path is also incomplete
-if(CMAKE_SYSTEM_NAME MATCHES "BSD")
-    foreach(incdir /usr/X11R6/include /usr/X11R7/include /usr/pkg/include /usr/local/include /usr/include)
-        if(EXISTS "${incdir}")
-            include_directories(${incdir})
-        endif()
-    endforeach()
-    foreach(linkdir /usr/X11R6/lib /usr/X11R7/lib /usr/pkg/lib /usr/local/lib /usr/lib /lib)
-        if(EXISTS "${linkdir}")
-            link_directories(${linkdir})
-        endif()
-    endforeach()
-endif()
-
 include(CheckCXXCompilerFlag)
 include(GNUInstallDirs)
 include(CheckIncludeFileCXX)
diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake
index 97c75a1d1..d7796bdd9 100644
--- a/cmake/modules/KatieBuildMacros.cmake
+++ b/cmake/modules/KatieBuildMacros.cmake
@@ -29,9 +29,6 @@ endfunction()
 
 # a function to check for C function/definition, works for external functions
 function(KATIE_CHECK_DEFINED FORDEFINITION FROMHEADER)
-    # see comment in top-level CMake file
-    set(CMAKE_REQUIRED_INCLUDES /usr/X11R6/include /usr/X11R7/include /usr/pkg/include /usr/local/include /usr/include)
-    set(CMAKE_REQUIRED_LINK_OPTIONS -L/usr/X11R6/lib -L/usr/X11R7/lib -L/usr/pkg/lib -L/usr/local/lib -L/usr/lib -L/lib)
     check_cxx_source_compiles(
         "
 #include <stdio.h>