@@ -1,6 +1,8 @@
 include ../extra.mk
+
+SUBDIRS = exceptions
 
 LIB = ${OBJFW_SHARED_LIB}
 LIB_MAJOR = ${OBJFW_LIB_MAJOR}
 LIB_MINOR = ${OBJFW_LIB_MINOR}
 STATIC_LIB = ${OBJFW_STATIC_LIB}
@@ -12,11 +14,10 @@
        OFConstantString.m	\
        OFDataArray.m		\
        OFDataArray+Hashing.m	\
        OFDate.m			\
        OFDictionary.m		\
-       OFExceptions.m		\
        OFFile.m			\
        OFHash.m			\
        OFHTTPRequest.m		\
        OFEnumerator.m		\
        OFList.m			\
@@ -48,10 +49,11 @@
        of_asprintf.m		\
        unicode.m
 
 INCLUDES := ${SRCS:.m=.h}	\
 	    OFCollection.h	\
+	    OFExceptions.h	\
 	    ObjFW.h		\
 	    asprintf.h		\
 	    ${ATOMIC_H}		\
 	    macros.h		\
 	    objfw-defs.h	\
@@ -64,8 +66,11 @@
 	${OBJC_PROPERTIES_M}	\
 	${OBJC_SYNC_M}
 
 include ../buildsys.mk
 
-CPPFLAGS += -I..
+CPPFLAGS += -I. -I.. -Iexceptions
 LD = ${OBJC}
 LDFLAGS += ${REEXPORT_LIBOBJC} ${MACH_ALIAS_LIST}
+
+LIB_OBJS += ${EXCEPTIONS_EXCEPTIONS_LIB_A}
+OBJS += ${EXCEPTIONS_EXCEPTIONS_A}