diff --git a/Makefile b/Makefile
index ab8a7643..ec6fad86 100644
--- a/Makefile
+++ b/Makefile
@@ -235,6 +235,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_write.c					\
 		src/md5.c						\
 		src/pthread_cond_broadcast.c				\
+		src/pthread_cond_destroy.c				\
 		src/pthread_cond_init.c					\
 		src/pthread_cond_signal.c				\
 		src/pthread_cond_timedwait.c				\
diff --git a/src/libhttp.c b/src/libhttp.c
index 9333e966..154dbd51 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -870,18 +870,6 @@ int clock_gettime( clockid_t clk_id, struct timespec *tp ) {
 #endif
 
 
-int pthread_cond_destroy( pthread_cond_t *cv ) {
-
-	EnterCriticalSection(&cv->threadIdSec);
-	assert(cv->waiting_thread == NULL);
-	LeaveCriticalSection(&cv->threadIdSec);
-	DeleteCriticalSection(&cv->threadIdSec);
-
-	return 0;
-
-}  /* pthread_cond_destroy */
-
-
 #ifdef ALTERNATIVE_QUEUE
 static void * event_create(void) {
 
diff --git a/src/pthread_cond_destroy.c b/src/pthread_cond_destroy.c
new file mode 100644
index 00000000..69387882
--- /dev/null
+++ b/src/pthread_cond_destroy.c
@@ -0,0 +1,85 @@
+/* 
+ * Copyright (c) 2016 Lammert Bies
+ * Copyright (c) 2013-2016 the Civetweb developers
+ * Copyright (c) 2004-2013 Sergey Lyubka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+
+#include "libhttp-private.h"
+
+
+
+#if defined(_WIN32)
+
+#ifndef WIN_PTHREADS_TIME_H
+int clock_gettime( clockid_t clk_id, struct timespec *tp ) {
+
+	FILETIME ft;
+	ULARGE_INTEGER li;
+	BOOL ok = FALSE;
+	double d;
+	static double perfcnt_per_sec = 0.0;
+
+	if (tp) {
+		memset(tp, 0, sizeof(*tp));
+		if (clk_id == CLOCK_REALTIME) {
+			GetSystemTimeAsFileTime(&ft);
+			li.LowPart = ft.dwLowDateTime;
+			li.HighPart = ft.dwHighDateTime;
+			li.QuadPart -= 116444736000000000; /* 1.1.1970 in filedate */
+			tp->tv_sec = (time_t)(li.QuadPart / 10000000);
+			tp->tv_nsec = (long)(li.QuadPart % 10000000) * 100;
+			ok = TRUE;
+		} else if (clk_id == CLOCK_MONOTONIC) {
+			if (perfcnt_per_sec == 0.0) {
+				QueryPerformanceFrequency((LARGE_INTEGER *)&li);
+				perfcnt_per_sec = 1.0 / li.QuadPart;
+			}
+			if (perfcnt_per_sec != 0.0) {
+				QueryPerformanceCounter((LARGE_INTEGER *)&li);
+				d = li.QuadPart * perfcnt_per_sec;
+				tp->tv_sec = (time_t)d;
+				d -= tp->tv_sec;
+				tp->tv_nsec = (long)(d * 1.0E9);
+				ok = TRUE;
+			}
+		}
+	}
+
+	return ok ? 0 : -1;
+
+}  /* clock_gettime */
+#endif
+
+
+int pthread_cond_destroy( pthread_cond_t *cv ) {
+
+	EnterCriticalSection(&cv->threadIdSec);
+	assert(cv->waiting_thread == NULL);
+	LeaveCriticalSection(&cv->threadIdSec);
+	DeleteCriticalSection(&cv->threadIdSec);
+
+	return 0;
+
+}  /* pthread_cond_destroy */
+
+#endif /* _WIN32 */