diff --git a/src/xpdev/genwrap.c b/src/xpdev/genwrap.c
index f8e7a9df97d71d6c2c30f3e0497b2ce31bfde9b4..5ecaae91e3cc5f52eb1415f5d309d3802fedb80c 100644
--- a/src/xpdev/genwrap.c
+++ b/src/xpdev/genwrap.c
@@ -142,7 +142,6 @@ void DLLCALL unix_beep(int freq, int dur)
 {
 	static int console_fd=-1;
 
-#if !defined(__OpenBSD__) && !defined(__GNU__) && !defined(__NetBSD__) && !defined(__QNX__)
 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
 	int speaker_fd=-1;
 	tone_t tone;
@@ -176,7 +175,6 @@ void DLLCALL unix_beep(int freq, int dur)
 #endif /* solaris */
 	}
 #endif
-#endif /* Nasty Kludge */
 }
 #endif
 
diff --git a/src/xpdev/genwrap.h b/src/xpdev/genwrap.h
index 03c9e061b254aa77cf00f42afa18a71892012090..8e3a6f724652067587132b39a3f910c03d35e316 100644
--- a/src/xpdev/genwrap.h
+++ b/src/xpdev/genwrap.h
@@ -125,6 +125,8 @@ extern "C" {
 	#define PLATFORM_DESC	"OpenBSD"
 #elif defined(__NetBSD__)
 	#define PLATFORM_DESC	"NetBSD"
+#elif defined(__APPLE__) && defined(__MACH__) && defined(__POWERPC__)
+	#define PLATFORM_DESC	"Mac OS X"
 #elif defined(BSD)
 	#define PLATFORM_DESC	"BSD"
 #elif defined(__solaris__)
@@ -135,8 +137,6 @@ extern "C" {
 	#define PLATFORM_DESC	"GNU/Hurd"
 #elif defined(__QNX__)
 	#define PLATFORM_DESC	"QNX"
-#elif defined(__APPLE__) && defined(__MACH__) && defined(__POWERPC__)
-	#define PLATFORM_DESC	"Mac OS X"
 #elif defined(__unix__)
 	#define PLATFORM_DESC	"Unix"
 #else