@@ -204,18 +204,16 @@
 	OFSandbox.m			\
 	OFStrFTime.m			\
 	OFStrPTime.m			\
 	OFSubarray.m			\
 	OFSubdata.m			\
-	OFTaggedPointerColor.m		\
-	OFTaggedPointerDate.m		\
-	OFTaggedPointerNumber.m		\
 	OFUTF8String.m			\
 	${LIBBASES_M}			\
 	${RUNTIME_AUTORELEASE_M}	\
 	${RUNTIME_INSTANCE_M}		\
-	${UNICODE_M}
+	${UNICODE_M}			\
+	${USE_SRCS_TAGGED_POINTER}
 SRCS_FILES += OFFileIRIHandler.m
 SRCS_SOCKETS += OFAsyncIPSocketConnector.m		\
 		OFDNSResolverSettings.m			\
 		${OF_EPOLL_KERNEL_EVENT_OBSERVER_M}	\
 		OFHTTPIRIHandler.m			\
@@ -223,10 +221,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_WINDOWS += platform/Windows/OFWin32ConsoleStdIOStream.m	\
 		versioninfo.rc
 
 OBJS_EXTRA = exceptions/exceptions.a	\
 	     encodings/encodings.a	\