Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -502,11 +502,11 @@
 AC_MSG_RESULT($objc_runtime)
 
 case "$objc_runtime" in
 "ObjFW runtime")
 	AC_DEFINE(OF_OBJFW_RUNTIME, 1, [Whether we use the ObjFW runtime])
-	AC_SUBST(USE_SRCS_TAGGED_POINTER, '${SRCS_TAGGED_POINTER}')
+	AC_SUBST(USE_SRCS_TAGGED_POINTERS, '${SRCS_TAGGED_POINTERS}')
 
 	AC_MSG_CHECKING([whether -fobjc-runtime=objfw is supported])
 
 	old_OBJCFLAGS="$OBJCFLAGS"
 	OBJCFLAGS="$OBJCFLAGS -Xclang -fobjc-runtime=objfw"

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -86,10 +86,10 @@
 USE_SRCS_APPLETALK = @USE_SRCS_APPLETALK@
 USE_SRCS_FILES = @USE_SRCS_FILES@
 USE_SRCS_IPX = @USE_SRCS_IPX@
 USE_SRCS_PLUGINS = @USE_SRCS_PLUGINS@
 USE_SRCS_SOCKETS = @USE_SRCS_SOCKETS@
-USE_SRCS_TAGGED_POINTER = @USE_SRCS_TAGGED_POINTER@
+USE_SRCS_TAGGED_POINTERS = @USE_SRCS_TAGGED_POINTERS@
 USE_SRCS_THREADS = @USE_SRCS_THREADS@
 USE_SRCS_UNIX_SOCKETS = @USE_SRCS_UNIX_SOCKETS@
 USE_SRCS_WINDOWS = @USE_SRCS_WINDOWS@
 WRAPPER = @WRAPPER@

Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -210,11 +210,11 @@
 	OFUTF8String.m			\
 	${LIBBASES_M}			\
 	${RUNTIME_AUTORELEASE_M}	\
 	${RUNTIME_INSTANCE_M}		\
 	${UNICODE_M}			\
-	${USE_SRCS_TAGGED_POINTER}
+	${USE_SRCS_TAGGED_POINTERS}
 SRCS_FILES += OFFileIRIHandler.m
 SRCS_SOCKETS += OFAsyncIPSocketConnector.m		\
 		OFDNSResolverSettings.m			\
 		${OF_EPOLL_KERNEL_EVENT_OBSERVER_M}	\
 		OFHTTPIRIHandler.m			\
@@ -222,13 +222,13 @@
 		OFKernelEventObserver.m			\
 		${OF_KQUEUE_KERNEL_EVENT_OBSERVER_M}	\
 		${OF_POLL_KERNEL_EVENT_OBSERVER_M}	\
 		${OF_SELECT_KERNEL_EVENT_OBSERVER_M}	\
 		OFTCPSocketSOCKS5Connector.m
-SRCS_TAGGED_POINTER = OFTaggedPointerColor.m		\
-		      OFTaggedPointerDate.m		\
-		      OFTaggedPointerNumber.m
+SRCS_TAGGED_POINTERS = OFTaggedPointerColor.m		\
+		       OFTaggedPointerDate.m		\
+		       OFTaggedPointerNumber.m
 SRCS_WINDOWS += platform/Windows/OFWin32ConsoleStdIOStream.m	\
 		versioninfo.rc
 
 OBJS_EXTRA = exceptions/exceptions.a	\
 	     encodings/encodings.a	\