diff --git a/src/sbbs3/sbbswrap.h b/src/sbbs3/sbbswrap.h
index 873d318632e249d5fb5ebc30012f20f7b3de0c51..16260c5701fe05873f87fc221f53b46a68e9e036 100644
--- a/src/sbbs3/sbbswrap.h
+++ b/src/sbbs3/sbbswrap.h
@@ -156,28 +156,20 @@ extern "C" {
 
 #if defined(_WIN32)
 
-	#define mswait(x)			Sleep(x)
 	#define sbbs_beep(freq,dur)	Beep(freq,dur)
 
 #elif defined(__OS2__)
 
-	#define mswait(x)			DosSleep(x)
 	#define sbbs_beep(freq,dur)	DosBeep(freq,dur)
 
 #elif defined(__unix__)
 
-	#define mswait(x)			usleep(x*1000)
-	#define _mkdir(dir)			mkdir(dir,0777)
-	#define _rmdir(dir)			rmdir(dir)
-	#define _fullpath(a,r,l)	realpath(r,a)
-	#define tell(fd)			lseek(fd,0,SEEK_CUR)
-
 	DLLEXPORT void	DLLCALL sbbs_beep(int freq, int dur);
 	DLLEXPORT char* DLLCALL strrev(char* str);
 
 #else	/* Unsupported OS */
 
-	#warning "Unsupported Target: Need some macros of function prototypes here."
+	#warning "Unsupported Target: Need some macros or function prototypes here."
 
 #endif
 
diff --git a/src/sbbs3/smbwrap.h b/src/sbbs3/smbwrap.h
index d11ba4c95b4fd19af800d8fcdd05397c928a9bde..d054de925bd03f9d9bc208f1e480d2aafd840518 100644
--- a/src/sbbs3/smbwrap.h
+++ b/src/sbbs3/smbwrap.h
@@ -81,6 +81,28 @@
 
 #endif
 
+#if defined(_WIN32)
+
+	#define mswait(x)			Sleep(x)
+
+#elif defined(__OS2__)
+
+	#define mswait(x)			DosSleep(x)
+
+#elif defined(__unix__)
+
+	#define mswait(x)			usleep(x*1000)
+	#define _mkdir(dir)			mkdir(dir,0777)
+	#define _rmdir(dir)			rmdir(dir)
+	#define _fullpath(a,r,l)	realpath(r,a)
+	#define tell(fd)			lseek(fd,0,SEEK_CUR)
+
+#else	/* Unsupported OS */
+
+	#warning "Unsupported Target: Need some macros or function prototypes here."
+
+#endif
+
 #include "smblib.h"	/* SMBEXPORT/SMBCALL */
 
 #ifndef BOOL