Index: tests/OFArray/OFArray.m
==================================================================
--- tests/OFArray/OFArray.m
+++ tests/OFArray/OFArray.m
@@ -9,14 +9,14 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <stdio.h>
-#import <stdlib.h>
-#import <string.h>
-#import <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
 
 #import "OFArray.h"
 #import "OFExceptions.h"
 #import "OFAutoreleasePool.h"
 

Index: tests/OFAutoreleasePool/OFAutoreleasePool.m
==================================================================
--- tests/OFAutoreleasePool/OFAutoreleasePool.m
+++ tests/OFAutoreleasePool/OFAutoreleasePool.m
@@ -9,13 +9,13 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import "OFAutoreleasePool.h"
+#include <stdio.h>
 
-#import <stdio.h>
+#import "OFAutoreleasePool.h"
 
 #ifndef _WIN32
 #define ZD "%zd"
 #else
 #define ZD "%u"

Index: tests/OFHashes/OFHashes.m
==================================================================
--- tests/OFHashes/OFHashes.m
+++ tests/OFHashes/OFHashes.m
@@ -9,12 +9,12 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <stdio.h>
-#import <string.h>
+#include <stdio.h>
+#include <string.h>
 
 #import "OFHashes.h"
 #import "OFFile.h"
 
 const uint8_t testfile_md5[MD5_DIGEST_SIZE] =

Index: tests/OFList/OFList.m
==================================================================
--- tests/OFList/OFList.m
+++ tests/OFList/OFList.m
@@ -9,17 +9,16 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <string.h>
+#include <stdio.h>
+#include <string.h>
 
 #import "OFString.h"
 #import "OFList.h"
 
-#import <stdio.h>
-
 #ifndef _WIN32
 #define ZD "%zd"
 #else
 #define ZD "%u"
 #endif

Index: tests/OFObject/OFObject.m
==================================================================
--- tests/OFObject/OFObject.m
+++ tests/OFObject/OFObject.m
@@ -9,13 +9,13 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <stdio.h>
-#import <stdlib.h>
-#import <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
 
 #import "OFObject.h"
 #import "OFExceptions.h"
 
 #define CATCH_EXCEPTION(code, exception)		\

Index: tests/OFString/OFString.m
==================================================================
--- tests/OFString/OFString.m
+++ tests/OFString/OFString.m
@@ -9,18 +9,17 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <string.h>
+#include <stdio.h>
+#include <string.h>
 
 #import "OFString.h"
 #import "OFExceptions.h"
 #import "OFAutoreleasePool.h"
 
-#import <stdio.h>
-
 #ifndef _WIN32
 #define ZD "%zd"
 #else
 #define ZD "%u"
 #endif

Index: tests/OFTCPSocket/OFTCPSocket.m
==================================================================
--- tests/OFTCPSocket/OFTCPSocket.m
+++ tests/OFTCPSocket/OFTCPSocket.m
@@ -9,13 +9,13 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <time.h>
-#import <stdlib.h>
-#import <string.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 
 #import "OFTCPSocket.h"
 #import "OFExceptions.h"
 
 inline uint16_t get_port()

Index: tests/OFXMLFactory/OFXMLFactory.m
==================================================================
--- tests/OFXMLFactory/OFXMLFactory.m
+++ tests/OFXMLFactory/OFXMLFactory.m
@@ -9,13 +9,13 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <stdio.h>
-#import <stdlib.h>
-#import <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #import "OFXMLFactory.h"
 
 #define NUM_TESTS 10