diff --git a/.cmake/ConfigureBsdPaths.cmake b/.cmake/ConfigureBsdPaths.cmake
index 7b14ee904..362ad5088 100644
--- a/.cmake/ConfigureBsdPaths.cmake
+++ b/.cmake/ConfigureBsdPaths.cmake
@@ -24,7 +24,4 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR
     "${BSD_PATH_PREFIX}/lib"
     "${BSD_PATH_PREFIX}/opt/openssl/lib"
     "${BSD_PATH_PREFIX}/opt/ncurses/lib")
-
-  include_directories("${BSD_PATH_PREFIX}/include")
-  link_directories("${BSD_PATH_PREFIX}/lib")
 endif ()
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c8e84399..5c15cbab8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,11 +18,11 @@ include(Colors)
 include(CMakeToolsHelpers OPTIONAL)
 include(CheckAtomic)
 include(AddPlugin)
-include(ConfigureRpath)
-include(ConfigureBsdPaths)
 if (${BUILD_STANDALONE} MATCHES "true")
   include(ConfigureStandalone)
 endif()
+include(ConfigureRpath)
+include(ConfigureBsdPaths)
 include(AddDarwinSystemLibs)
 include(AddLinuxSystemLibs)
 include(ConfigureCurses)
diff --git a/script/build-vendor-libraries.sh b/script/build-vendor-libraries.sh
index c368bc347..a2106d000 100755
--- a/script/build-vendor-libraries.sh
+++ b/script/build-vendor-libraries.sh
@@ -28,7 +28,7 @@ OS=$(uname)
 ARCH=$(uname -m)
 SCRIPTDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 OPENSSL_VERSION="3.1.0"
-CURL_VERSION="7.88.1"
+CURL_VERSION="8.0.1"
 LIBMICROHTTPD_VERSION="0.9.76"
 FFMPEG_VERSION="6.0"
 LAME_VERSION="3.100"
diff --git a/src/plugins/ffmpegdecoder/CMakeLists.txt b/src/plugins/ffmpegdecoder/CMakeLists.txt
index 1cded5f77..efb67cc4f 100644
--- a/src/plugins/ffmpegdecoder/CMakeLists.txt
+++ b/src/plugins/ffmpegdecoder/CMakeLists.txt
@@ -5,7 +5,7 @@ set (ffmpegdecoder_SOURCES
 add_library(ffmpegdecoder SHARED ${ffmpegdecoder_SOURCES})
 
 if (${BUILD_STANDALONE} MATCHES "true")
-    include_directories(BEFORE ${VENDOR_INCLUDE_DIRECTORIES})
+    include_directories(AFTER ${VENDOR_INCLUDE_DIRECTORIES})
     message(STATUS "[ffmpegdecoder] using include dirs: ${VENDOR_INCLUDE_DIRECTORIES}")
     find_vendor_library(AVCODEC avcodec-musikcube)
     find_vendor_library(AVUTIL avutil-musikcube)
diff --git a/src/plugins/portaudioout/CMakeLists.txt b/src/plugins/portaudioout/CMakeLists.txt
index c8757944c..083523924 100644
--- a/src/plugins/portaudioout/CMakeLists.txt
+++ b/src/plugins/portaudioout/CMakeLists.txt
@@ -9,6 +9,7 @@ if ("${LIBPORTAUDIO}" STREQUAL "LIBPORTAUDIO-NOTFOUND")
   disable_plugin(portaudioout)
 else()
   add_library(portaudioout SHARED ${portaudioout_SOURCES})
+  include_directories("${BSD_PATH_PREFIX}/include")
   target_link_libraries(portaudioout ${LIBPORTAUDIO})
   message(STATUS "[portaudioout] using libportaudio at: ${LIBPORTAUDIO}")
 endif()
\ No newline at end of file