Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -25,10 +25,12 @@
        OFEmbeddedFileURLHandler.m	\
        OFEnumerator.m			\
        OFFileManager.m			\
        OFGZIPStream.m			\
        OFHMAC.m				\
+       OFINICategory.m			\
+       OFINIFile.m			\
        OFInflate64Stream.m		\
        OFInflateStream.m		\
        OFInvocation.m			\
        OFLHAArchive.m			\
        OFLHAArchiveEntry.m		\
@@ -85,10 +87,11 @@
        OFString+Serialization.m		\
        OFString+URLEncoding.m		\
        OFString+XMLEscaping.m		\
        OFString+XMLUnescaping.m		\
        ${OF_SUBPROCESS_M}		\
+       OFSettings.m			\
        OFSystemInfo.m			\
        OFTarArchive.m			\
        OFTarArchiveEntry.m		\
        OFThread.m			\
        OFTimer.m			\
@@ -113,13 +116,10 @@
        ${USE_SRCS_PLUGINS}		\
        ${USE_SRCS_SOCKETS}		\
        ${USE_SRCS_THREADS}		\
        ${USE_SRCS_WINDOWS}
 SRCS_FILES = OFFile.m			\
-	     OFINICategory.m		\
-	     OFINIFile.m		\
-	     OFSettings.m		\
 	     OFString+PathAdditions.m
 SRCS_PLUGINS = OFPlugin.m
 SRCS_SOCKETS = OFDNSQuery.m			\
 	       OFDNSResolver.m			\
 	       OFDNSResourceRecord.m		\

Index: src/ObjFW.h
==================================================================
--- src/ObjFW.h
+++ src/ObjFW.h
@@ -67,13 +67,13 @@
 #import "OFZIPArchive.h"
 #import "OFZIPArchiveEntry.h"
 #import "OFFileManager.h"
 #ifdef OF_HAVE_FILES
 # import "OFFile.h"
-# import "OFINIFile.h"
-# import "OFSettings.h"
 #endif
+#import "OFINIFile.h"
+#import "OFSettings.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFStreamSocket.h"
 # import "OFDatagramSocket.h"
 # import "OFSequencedPacketSocket.h"
 # import "OFTCPSocket.h"

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -23,10 +23,11 @@
        OFCharacterSetTests.m		\
        OFDataTests.m			\
        OFDateTests.m			\
        OFDictionaryTests.m		\
        OFHMACTests.m			\
+       OFINIFileTests.m			\
        OFInvocationTests.m		\
        OFJSONTests.m			\
        OFListTests.m			\
        OFLocaleTests.m			\
        OFMD5HashTests.m			\
@@ -63,11 +64,10 @@
        ${USE_SRCS_THREADS}		\
        ${USE_SRCS_WINDOWS}		\
        serialization_xml.m		\
        testfile_bin.m			\
        testfile_ini.m
-SRCS_FILES = OFINIFileTests.m
 SRCS_PLUGINS = OFPluginTests.m
 SRCS_SOCKETS = OFDNSResolverTests.m		\
 	       ${OF_HTTP_CLIENT_TESTS_M}	\
 	       OFHTTPCookieTests.m		\
 	       OFHTTPCookieManagerTests.m	\

Index: tests/TestsAppDelegate.m
==================================================================
--- tests/TestsAppDelegate.m
+++ tests/TestsAppDelegate.m
@@ -400,11 +400,11 @@
 	[self SHA384HashTests];
 	[self SHA512HashTests];
 	[self HMACTests];
 	[self PBKDF2Tests];
 	[self scryptTests];
-#if defined(OF_HAVE_FILES) && defined(HAVE_CODEPAGE_437)
+#ifdef HAVE_CODEPAGE_437
 	[self INIFileTests];
 #endif
 #ifdef OF_HAVE_SOCKETS
 	[self socketTests];
 	[self TCPSocketTests];