diff --git a/src/i18n.c b/src/i18n.c
index ed9fd0cc0..9eaec5a04 100644
--- a/src/i18n.c
+++ b/src/i18n.c
@@ -46,11 +46,6 @@
 
 #ifndef OLD_UPPERCASE_CODE
 #include <wctype.h>
-#else
-#if defined (__BEOS__) && !defined (__HAIKU__)
-#include <wchar.h>
-#else
-#endif
 #endif
 
 
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 865a91ca7..856a76099 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -200,8 +200,6 @@ char *strcasestr(const char *haystack, const char *needle)
 #endif
 
 
-#include <wchar.h>
-
 // math.h makes y1 an obscure function!
 #define y1 evil_y1
 #include <math.h>
@@ -209,12 +207,10 @@ char *strcasestr(const char *haystack, const char *needle)
 
 #include <locale.h>
 
+#include <wchar.h>
+
 #ifndef OLD_UPPERCASE_CODE
 #include <wctype.h>
-#else
-#if defined (__BEOS__) && !defined (__HAIKU__)
-#include <wchar.h> // FIXME - Going to happen anway, due to #include above! -bjk 2008.05.28
-#endif
 #endif
 
 #include <libintl.h>