diff --git a/lib/isc/task.c b/lib/isc/task.c
index 97f7b1aa74..d0e5f4d32d 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.c,v 1.76 2000/12/06 00:30:11 tale Exp $ */
+/* $Id: task.c,v 1.77 2000/12/26 21:12:21 tale Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -28,17 +28,18 @@
 
 #include <config.h>
 
-#include <isc/condition.h>
 #include <isc/event.h>
 #include <isc/mem.h>
 #include <isc/msgs.h>
 #include <isc/platform.h>
 #include <isc/string.h>
 #include <isc/task.h>
-#include <isc/thread.h>
 #include <isc/util.h>
 
-#ifndef ISC_PLATFORM_USETHREADS
+#ifdef ISC_PLATFORM_USETHREADS
+#include <isc/condition.h>
+#include <isc/thread.h>
+#else /* ISC_PLATFORM_USETHREADS */
 #include "task_p.h"
 #endif /* ISC_PLATFORM_USETHREADS */
 
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 75eb663701..1dbf74751b 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -15,22 +15,23 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.59 2000/12/06 00:30:13 tale Exp $ */
+/* $Id: timer.c,v 1.60 2000/12/26 21:12:23 tale Exp $ */
 
 #include <config.h>
 
-#include <isc/condition.h>
 #include <isc/heap.h>
 #include <isc/mem.h>
 #include <isc/msgs.h>
 #include <isc/platform.h>
 #include <isc/task.h>
-#include <isc/thread.h>
 #include <isc/time.h>
 #include <isc/timer.h>
 #include <isc/util.h>
 
-#ifndef ISC_PLATFORM_USETHREADS
+#ifdef ISC_PLATFORM_USETHREADS
+#include <isc/condition.h>
+#include <isc/thread.h>
+#else /* ISC_PLATFORM_USETHREADS */
 #include "timer_p.h"
 #endif /* ISC_PLATFORM_USETHREADS */
 
diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index 2f1e30a680..a251f42575 100644
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app.c,v 1.34 2000/12/06 00:30:19 tale Exp $ */
+/* $Id: app.c,v 1.35 2000/12/26 21:12:24 tale Exp $ */
 
 #include <config.h>
 
@@ -29,9 +29,7 @@
 
 #include <isc/app.h>
 #include <isc/boolean.h>
-#include <isc/condition.h>
 #include <isc/msgs.h>
-#include <isc/mutex.h>
 #include <isc/event.h>
 #include <isc/platform.h>
 #include <isc/string.h>
@@ -41,6 +39,8 @@
 
 #ifdef ISC_PLATFORM_USETHREADS
 #include <pthread.h>
+#include <isc/condition.h>
+#include <isc/mutex.h>
 #else /* ISC_PLATFORM_USETHREADS */
 #include "../timer_p.h"
 #include "../task_p.h"
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index d3a4a1252c..fc5d81183a 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.176 2000/12/19 20:35:36 bwelling Exp $ */
+/* $Id: socket.c,v 1.177 2000/12/26 21:12:25 tale Exp $ */
 
 #include <config.h>
 
@@ -34,22 +34,23 @@
 
 #include <isc/buffer.h>
 #include <isc/bufferlist.h>
-#include <isc/condition.h>
 #include <isc/list.h>
 #include <isc/log.h>
 #include <isc/mem.h>
 #include <isc/msgs.h>
-#include <isc/mutex.h>
 #include <isc/net.h>
 #include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/region.h>
 #include <isc/socket.h>
 #include <isc/task.h>
-#include <isc/thread.h>
 #include <isc/util.h>
 
-#ifndef ISC_PLATFORM_USETHREADS
+#ifdef ISC_PLATFORM_USETHREADS
+#include <isc/condition.h>
+#include <isc/mutex.h>
+#include <isc/thread.h>
+#else /* ISC_PLATFORM_USETHREADS */
 #include "socket_p.h"
 #endif /* ISC_PLATFORM_USETHREADS */