Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -10,13 +10,13 @@
  */
 
 #import "config.h"
 
 #import <stdio.h>
-#import <unistd.h>
 #import <string.h>
-#import <wchar.h>
+#import <unistd.h>
+#include <wchar.h>  /* include due to glibc brokenness */
 
 #import <sys/types.h>
 #import <sys/stat.h>
 
 #import "OFFile.h"

Index: src/OFSocket.m
==================================================================
--- src/OFSocket.m
+++ src/OFSocket.m
@@ -9,14 +9,15 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
+#import <stdio.h>
 #import <stdlib.h>
 #import <string.h>
 #import <unistd.h>
-#import <wchar.h>
+#include <wchar.h>  /* include due to glibc brokenness */
 
 #import "OFSocket.h"
 #import "OFExceptions.h"
 
 @implementation OFSocketAddress