diff --git a/Makefile b/Makefile
index b7ebfb81..ef8d6410 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ all: $(PROGS)
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(MYCFLAGS) $^ -o $@
 
-notmuch: notmuch.o database.o message.o xutil.o
+notmuch: notmuch.o database.o date.o message.o xutil.o
 	$(CC) $(MYLDFLAGS) $^ -o $@
 
 notmuch-index-message: notmuch-index-message.cc
diff --git a/database.cc b/database.cc
index 7ea1f416..6ac04f74 100644
--- a/database.cc
+++ b/database.cc
@@ -554,13 +554,11 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
 	free (message_id);
 
-/*
 	date = notmuch_message_get_header (message, "date");
 	time_value = notmuch_parse_date (date, NULL);
 
 	doc.add_value (NOTMUCH_VALUE_DATE,
 		       Xapian::sortable_serialise (time_value));
-*/
 
 	db->add_document (doc);
     } catch (const Xapian::Error &error) {
diff --git a/date.c b/date.c
index 3f337c96..c116bbd5 100644
--- a/date.c
+++ b/date.c
@@ -27,6 +27,8 @@
 
 #include <time.h>
 
+#include <glib.h> /* For g_ascii_strncasecmp only. */
+
 #ifndef FALSE
 #define FALSE 0
 #endif