diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
index f7953a932..31b06655a 100644
--- a/OpenChange/GNUmakefile
+++ b/OpenChange/GNUmakefile
@@ -39,7 +39,7 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	MAPIStoreDeletedItemsContext.m \
 	MAPIStoreDraftsContext.m \
 	MAPIStoreFreebusyContext.m \
-	MAPIStoreFileSystemBaseContext.m \
+	MAPIStoreFSBaseContext.m \
 	MAPIStoreGCSBaseContext.m \
 	MAPIStoreJournalContext.m \
 	MAPIStoreMailContext.m \
@@ -54,6 +54,18 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	MAPIStoreTasksContext.m \
 	MAPIStoreViewsContext.m \
 	\
+	MAPIStoreTable.m \
+	MAPIStoreMessageTable.m \
+	MAPIStoreFolderTable.m \
+	MAPIStoreFSMessageTable.m \
+	MAPIStoreGCSMessageTable.m \
+	MAPIStoreFAIMessageTable.m \
+	MAPIStoreCalendarMessageTable.m \
+	MAPIStoreContactsMessageTable.m \
+	MAPIStoreMailMessageTable.m \
+	MAPIStoreMailFolderTable.m \
+	MAPIStoreTasksMessageTable.m \
+	\
 	SOGoAppointmentObject+MAPIStore.m \
 	SOGoContentObject+MAPIStore.m \
 	SOGoContactGCSEntry+MAPIStore.m \