diff --git a/src/business/business-core/gncBillTerm.h b/src/business/business-core/gncBillTerm.h
index e8371a0a16..a773a831c2 100644
--- a/src/business/business-core/gncBillTerm.h
+++ b/src/business/business-core/gncBillTerm.h
@@ -11,7 +11,7 @@ typedef struct _gncBillTerm GncBillTerm;
 
 #include "gnc-numeric.h"
 #include "gnc-book.h"
-#include "date.h"
+#include "gnc-date.h"
 
 #define GNC_BILLTERM_MODULE_NAME "gncBillTerm"
 
diff --git a/src/business/business-core/gncEntry.h b/src/business/business-core/gncEntry.h
index e5ab3e401d..ab9d9ba8c0 100644
--- a/src/business/business-core/gncEntry.h
+++ b/src/business/business-core/gncEntry.h
@@ -20,8 +20,8 @@ typedef enum {
   GNC_DISC_POSTTAX
 } GncDiscountHow;
 
-#include "date.h"
 #include "gnc-book.h"
+#include "gnc-date.h"
 #include "gncTaxTable.h"
 #include "gncOrder.h"
 #include "gncInvoice.h"
diff --git a/src/business/business-core/gncTaxTable.h b/src/business/business-core/gncTaxTable.h
index d6a2dbffc9..abdd30b5ca 100644
--- a/src/business/business-core/gncTaxTable.h
+++ b/src/business/business-core/gncTaxTable.h
@@ -13,7 +13,7 @@ typedef struct _gncAccountValue GncAccountValue;
 
 #include "gnc-numeric.h"
 #include "gnc-book.h"
-#include "date.h"
+#include "gnc-date.h"
 #include "Account.h"
 
 #define GNC_TAXTABLE_MODULE_NAME "gncTaxTable"
diff --git a/src/business/business-gnome/dialog-date-close.h b/src/business/business-gnome/dialog-date-close.h
index a04152242c..6efd991ed1 100644
--- a/src/business/business-gnome/dialog-date-close.h
+++ b/src/business/business-gnome/dialog-date-close.h
@@ -7,9 +7,9 @@
 #ifndef _DIALOG_DATE_CLOSE_H
 #define _DIALOG_DATE_CLOSE_H
 
-#include "date.h"
 #include "Account.h"
 #include "gnc-book.h"
+#include "gnc-date.h"
 #include "gncBillTerm.h"
 
 gboolean