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

Index: src/OFAutoreleasePool.m
==================================================================
--- src/OFAutoreleasePool.m
+++ src/OFAutoreleasePool.m
@@ -7,22 +7,22 @@
  * This file is part of libobjfw. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
-#import <stdlib.h>
+#include <stdlib.h>
 
 #ifndef _WIN32
-#import <pthread.h>
+#include <pthread.h>
 #endif
 
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
 #import "OFList.h"
 
 #ifdef _WIN32
-#import <windows.h>
+#include <windows.h>
 #endif
 
 #ifndef _WIN32
 #define get_tls(t) pthread_getspecific(pool_list_key)
 #define set_tls(t, v) pthread_setspecific(t, v)

Index: src/OFExceptions.m
==================================================================
--- src/OFExceptions.m
+++ src/OFExceptions.m
@@ -10,22 +10,22 @@
  */
 
 #import "config.h"
 
 #define _GNU_SOURCE
-#import <stdio.h>
-#import <stdlib.h>
-#import <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #ifndef _WIN32
-#import <errno.h>
+#include <errno.h>
 #define GET_ERR	     errno
 #define GET_SOCK_ERR errno
 #define ERRFMT	     "Error string was: %s"
 #define ERRPARAM     strerror(err)
 #else
-#import <windows.h>
+#include <windows.h>
 #define GET_ERR	     GetLastError()
 #define GET_SOCK_ERR WSAGetLastError()
 #define ERRFMT	     "Error code was: %d"
 #define ERRPARAM     err
 #endif

Index: src/OFFile.h
==================================================================
--- src/OFFile.h
+++ src/OFFile.h
@@ -7,14 +7,14 @@
  * This file is part of libobjfw. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
-#import <stdio.h>
+#include <stdio.h>
 
 #ifndef _WIN32
-#import <sys/types.h>
+#include <sys/types.h>
 #else
 typedef int uid_t;
 typedef int gid_t;
 #endif
 

Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -9,17 +9,17 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <stdio.h>
-#import <string.h>
-#import <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 #ifndef _WIN32
-#import <sys/types.h>
-#import <sys/stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #endif
 
 #import "OFFile.h"
 #import "OFExceptions.h"
 

Index: src/OFHashes.m
==================================================================
--- src/OFHashes.m
+++ src/OFHashes.m
@@ -9,11 +9,11 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <string.h>
+#include <string.h>
 
 #import "OFHashes.h"
 #import "OFMacros.h"
 
 /*******

Index: src/OFNumber.h
==================================================================
--- src/OFNumber.h
+++ src/OFNumber.h
@@ -7,11 +7,11 @@
  * This file is part of libobjfw. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
-#import <unistd.h>
+#include <unistd.h>
 
 #import "OFObject.h"
 
 enum of_number_type {
 	OF_NUMBER_CHAR,

Index: src/OFObject.h
==================================================================
--- src/OFObject.h
+++ src/OFObject.h
@@ -9,11 +9,11 @@
  * the packaging of this file.
  */
 
 #import <objc/Object.h>
 
-#import <stdint.h>
+#include <stdint.h>
 
 /**
  * The OFObject class is the base class for all other classes inside ObjFW.
  */
 @interface OFObject: Object

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -9,13 +9,13 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <stdlib.h>
-#import <string.h>
-#import <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
 
 #import "OFObject.h"
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
 #import "OFMacros.h"

Index: src/OFString.h
==================================================================
--- src/OFString.h
+++ src/OFString.h
@@ -7,12 +7,12 @@
  * This file is part of libobjfw. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
-#import <stdarg.h>
-#import <stdio.h>
+#include <stdio.h>
+#include <stdarg.h>
 
 #import "OFObject.h"
 #import "OFComparable.h"
 
 /**

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -10,18 +10,18 @@
  */
 
 #import "config.h"
 
 #define _GNU_SOURCE
-#import <stdarg.h>
-#import <stdio.h>
-#import <stdlib.h>
-#import <string.h>
-#import <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
 
 #ifdef HAVE_SYS_MMAN_H
-#import <sys/mman.h>
+#include <sys/mman.h>
 #else
 #define madvise(addr, len, advise)
 #endif
 
 #import "OFString.h"

Index: src/OFTCPSocket.h
==================================================================
--- src/OFTCPSocket.h
+++ src/OFTCPSocket.h
@@ -7,19 +7,19 @@
  * This file is part of libobjfw. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
-#import <stdio.h>
+#include <stdio.h>
 
 /*
  * Headers for UNIX systems
  */
 #ifndef _WIN32
-#import <sys/types.h>
-#import <sys/socket.h>
-#import <netdb.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
 #endif
 
 #import "OFObject.h"
 #import "OFStream.h"
 
@@ -28,12 +28,12 @@
  *
  * These must be imported after objc/Object and thus OFObject!
  */
 #ifdef _WIN32
 #define _WIN32_WINNT 0x0501
-#import <winsock2.h>
-#import <ws2tcpip.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #endif
 
 /**
  * The OFTCPSocket class provides functions to create and use sockets.
  */

Index: src/OFTCPSocket.m
==================================================================
--- src/OFTCPSocket.m
+++ src/OFTCPSocket.m
@@ -9,15 +9,15 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <stdio.h>
-#import <stdlib.h>
-#import <string.h>
-#import <unistd.h>
-#import <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 #import "OFTCPSocket.h"
 #import "OFExceptions.h"
 
 #ifndef INVALID_SOCKET

Index: src/OFXMLFactory.h
==================================================================
--- src/OFXMLFactory.h
+++ src/OFXMLFactory.h
@@ -7,12 +7,12 @@
  * This file is part of libobjfw. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
-#import <stdarg.h>
-#import <stdio.h>
+#include <stdio.h>
+#include <stdarg.h>
 
 #import "OFObject.h"
 
 /**
  * The OFXMLFactory class provides an easy way to create XML stanzas.

Index: src/OFXMLFactory.m
==================================================================
--- src/OFXMLFactory.m
+++ src/OFXMLFactory.m
@@ -9,15 +9,15 @@
  * the packaging of this file.
  */
 
 #import "config.h"
 
-#import <stdarg.h>
-#import <stdio.h>
-#import <stdlib.h>
-#import <string.h>
-#import <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <limits.h>
 
 #import "OFXMLFactory.h"
 #import "OFExceptions.h"
 #import "OFMacros.h"