diff --git a/cmake/DPF-plugin.cmake b/cmake/DPF-plugin.cmake
index b32d84d3..6c8e6724 100644
--- a/cmake/DPF-plugin.cmake
+++ b/cmake/DPF-plugin.cmake
@@ -122,6 +122,10 @@ function(dpf_add_plugin NAME)
   target_include_directories("${NAME}" PUBLIC
     "${DPF_ROOT_DIR}/distrho")
 
+  if((NOT WIN32) AND (NOT APPLE) AND (NOT HAIKU))
+    target_link_libraries("${NAME}" PRIVATE "dl")
+  endif()
+
   if(_dgl_library)
     # make sure that all code will see DGL_* definitions
     target_link_libraries("${NAME}" PUBLIC
@@ -135,6 +139,9 @@ function(dpf_add_plugin NAME)
   if(_dgl_library)
     dpf__add_static_library("${NAME}-ui" ${_dpf_plugin_FILES_UI})
     target_link_libraries("${NAME}-ui" PUBLIC "${NAME}" ${_dgl_library})
+    if((NOT WIN32) AND (NOT APPLE) AND (NOT HAIKU))
+      target_link_libraries("${NAME}-ui" PRIVATE "dl")
+    endif()
     # add the files containing Objective-C classes, recompiled under namespace
     dpf__add_plugin_specific_ui_sources("${NAME}-ui")
   else()
@@ -185,11 +192,6 @@ function(dpf__build_jack NAME DGL_LIBRARY)
     RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin/$<0:>"
     OUTPUT_NAME "${NAME}")
 
-  # Note: libjack will be linked at runtime
-  if((NOT WIN32) AND (NOT APPLE) AND (NOT HAIKU))
-    target_link_libraries("${NAME}-jack" PRIVATE "dl")
-  endif()
-
   # for RtAudio native fallback
   if(APPLE)
     find_library(APPLE_COREAUDIO_FRAMEWORK "CoreAudio")
diff --git a/distrho/src/DistrhoUtils.cpp b/distrho/src/DistrhoUtils.cpp
index c3e00651..fe5d7573 100644
--- a/distrho/src/DistrhoUtils.cpp
+++ b/distrho/src/DistrhoUtils.cpp
@@ -20,7 +20,9 @@
 
 #include "../extra/String.hpp"
 
-#ifndef DISTRHO_OS_WINDOWS
+#ifdef DISTRHO_OS_WINDOWS
+# include <windows.h>
+#else
 # include <dlfcn.h>
 #endif