diff --git a/source/backend/CarlaUtils.cpp b/source/backend/CarlaUtils.cpp
index a125c12e4..cd2dedc23 100644
--- a/source/backend/CarlaUtils.cpp
+++ b/source/backend/CarlaUtils.cpp
@@ -801,7 +801,7 @@ int carla_cocoa_get_window(void* nsViewPtr)
 
 #include "CarlaPipeUtils.cpp"
 
-#ifndef DEBUG
+#if !(defined(DEBUG) || defined(BUILDING_CARLA_FOR_WINDOWS))
 # include "water/misc/Time.cpp"
 #endif
 
diff --git a/source/bridges-ui/CarlaBridgeFormat.cpp b/source/bridges-ui/CarlaBridgeFormat.cpp
index a4d4a7d6b..7e7d0ca3e 100644
--- a/source/bridges-ui/CarlaBridgeFormat.cpp
+++ b/source/bridges-ui/CarlaBridgeFormat.cpp
@@ -351,7 +351,7 @@ CARLA_BRIDGE_UI_END_NAMESPACE
 
 #include "CarlaPipeUtils.cpp"
 
-#ifndef DEBUG
+#if !(defined(DEBUG) || defined(BUILDING_CARLA_FOR_WINDOWS))
 # include "water/misc/Time.cpp"
 #endif
 
diff --git a/source/bridges-ui/Makefile b/source/bridges-ui/Makefile
index 75bdfa92d..025f8b0e0 100644
--- a/source/bridges-ui/Makefile
+++ b/source/bridges-ui/Makefile
@@ -23,7 +23,7 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 
 BUILD_CXX_FLAGS  += -DBUILD_BRIDGE -DBUILD_BRIDGE_UI -I. -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/utils -I$(CWD)/modules
-LINK_FLAGS       += $(WATER_LIBS)
+LINK_FLAGS       += $(WATER_LIBS) -lpthread
 
 # ---------------------------------------------------------------------------------------------------------------------
 
diff --git a/source/modules/water/water.files.cpp b/source/modules/water/water.files.cpp
index ce67fc4b9..a79518b03 100644
--- a/source/modules/water/water.files.cpp
+++ b/source/modules/water/water.files.cpp
@@ -42,7 +42,7 @@ HINSTANCE water_getCurrentModuleInstanceHandle() noexcept
 #include "text/StringArray.cpp"
 #include "text/String.cpp"
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(BUILDING_CARLA_FOR_WINDOWS)
 # include "files/DirectoryIterator.cpp"
 # include "files/FileInputStream.cpp"
 # include "files/FileOutputStream.cpp"
diff --git a/source/utils/CarlaPipeUtils.cpp b/source/utils/CarlaPipeUtils.cpp
index 50baca1c6..c551a3bbd 100644
--- a/source/utils/CarlaPipeUtils.cpp
+++ b/source/utils/CarlaPipeUtils.cpp
@@ -37,7 +37,9 @@
 #include "water/misc/Time.h"
 #include "water/text/String.h"
 
-#ifndef CARLA_OS_WIN
+#ifdef CARLA_OS_WIN
+# include <ctime>
+#else
 # include <cerrno>
 # include <signal.h>
 # include <sys/wait.h>