diff --git a/src/sbbs3/mailsrvr.h b/src/sbbs3/mailsrvr.h
index 04f44595e603996d5a3e1f026aa735310c3a4cff..0d1ae33f61bcd1bbe4e100c10a7f5a79a0ebd24b 100644
--- a/src/sbbs3/mailsrvr.h
+++ b/src/sbbs3/mailsrvr.h
@@ -8,7 +8,7 @@
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2003 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -40,6 +40,7 @@
 
 #include "client.h"				/* client_t */
 #include "sockwrap.h"           /* SOCKET */
+#include "semwrap.h"			/* sem_t */
 
 typedef struct {
 
diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h
index 758b42b146e14315fbb6ba00153d00798f073c3a..0426b3bb6db67cfcfa699d0cd57d0d769c1ba5f9 100644
--- a/src/sbbs3/sbbs.h
+++ b/src/sbbs3/sbbs.h
@@ -105,6 +105,7 @@
 /***********************/
 #ifdef __cplusplus
 	#include "startup.h"
+	#include "threadwrap.h"	/* pthread_mutex_t */
 #endif
 #ifdef SBBS	
 	#include "text.h"
diff --git a/src/sbbs3/sbbscon.c b/src/sbbs3/sbbscon.c
index 5ca7d2dad21e0708e8a0a86cf6caab58c44addff..2446f3eb6d854fb55d8542ed6f828898a4812cb3 100644
--- a/src/sbbs3/sbbscon.c
+++ b/src/sbbs3/sbbscon.c
@@ -45,13 +45,16 @@
 #endif
 
 /* Synchronet-specific headers */
-#include "conwrap.h"	/* kbhit/getch */
 #include "sbbs.h"		/* load_cfg() */
 #include "sbbs_ini.h"	/* sbbs_read_ini() */
 #include "ftpsrvr.h"	/* ftp_startup_t, ftp_server */
 #include "mailsrvr.h"	/* mail_startup_t, mail_server */
 #include "services.h"	/* services_startup_t, services_thread */
 
+/* XPDEV headers */
+#include "conwrap.h"	/* kbhit/getch */
+#include "threadwrap.h"	/* pthread_mutex_t */
+
 #ifdef __unix__
 
 #include <sys/types.h>
diff --git a/src/sbbs3/services.h b/src/sbbs3/services.h
index 277f0f6855052e7f7eb7360dddc489df56a3a605..86e43f3189b60bd341e4e0065c0e63c81b0f47a8 100644
--- a/src/sbbs3/services.h
+++ b/src/sbbs3/services.h
@@ -8,7 +8,7 @@
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2003 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -43,6 +43,7 @@
 #endif
 
 #include "client.h"
+#include "semwrap.h"			/* sem_t */
 
 typedef struct {
 
diff --git a/src/sbbs3/startup.h b/src/sbbs3/startup.h
index 6c00786188dd6e9416b632e07812089a6be3c354..1cdfead3b2b8baa72eb64781f8b1ea37be607b00 100644
--- a/src/sbbs3/startup.h
+++ b/src/sbbs3/startup.h
@@ -44,7 +44,7 @@
 
 #include "client.h"
 #include "ringbuf.h"
-#include "threadwrap.h"	/* sem_t */
+#include "semwrap.h"	/* sem_t */
 #include "ini_file.h"	/* INI_MAX_VALUE_LEN */
 
 typedef struct {
diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c
index 7aef0e133ede1d2416c97f4527b0afb880cc83d9..cb8071f0eb4f07396f8b388e6fda7b957af71cc6 100644
--- a/src/sbbs3/websrvr.c
+++ b/src/sbbs3/websrvr.c
@@ -8,7 +8,7 @@
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2003 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -99,6 +99,7 @@
 #include "sbbs.h"
 #include "link_list.h"
 #include "sockwrap.h"		/* sendfilesocket() */
+#include "threadwrap.h"		/* pthread_mutex_t */
 #include "semwrap.h"
 #include "websrvr.h"
 #include "base64.h"
diff --git a/src/sbbs3/websrvr.h b/src/sbbs3/websrvr.h
index 687fe36354449d52e1e0fbc9ddf7f3e1f65f16a4..5382efb9f396e27498174840098123ecf729cd3f 100644
--- a/src/sbbs3/websrvr.h
+++ b/src/sbbs3/websrvr.h
@@ -40,6 +40,7 @@
 
 #include "client.h"				/* client_t */
 #include "startup.h"			/* BBS_OPT_* */
+#include "semwrap.h"			/* sem_t */
 
 typedef struct {
 	DWORD	size;				/* sizeof(web_startup_t) */