diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index a085ca5ff9..964e63240f 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* e-calendar.c: More header fixes.
+	* e-cell-date-edit.c: Same.
+	* e-dateedit.[ch]: Same.
+	* e-title-bar.c: Same here.
+	* e-search-bar.c: More header fixes.
+	* test-calendar.c: Same here.
+	
 2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* e-dropdown-button.c: Replace #include <gtk/gtk.h>
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index a8a960b7dd..fcebf5285a 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -31,6 +31,11 @@
  */
 
 #include <config.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkpixmap.h>
+#include <gtk/gtksignal.h>
+#include <libgnomeui/gnome-canvas-widget.h>
 #include <gal/util/e-util.h>
 #include "e-calendar.h"
 
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index 9c3ba8cae5..53c8578dc1 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -28,9 +28,12 @@
  */
 
 #include <config.h>
+#include <time.h>
 #include <gal/util/e-i18n.h>
 #include <gdk/gdkkeysyms.h>
-#include "gal/util/e-util.h"
+#include <libgnomeui/gnome-messagebox.h>
+#include <libgnomeui/gnome-stock.h>
+#include <gal/util/e-util.h>
 #include <gal/e-table/e-table-item.h>
 #include <e-util/e-time-utils.h>
 #include "e-cell-date-edit.h"
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 74b205867a..44a0b7b4e4 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -38,19 +38,28 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtkarrow.h>
+#include <gtk/gtkbbox.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtkframe.h>
+#include <gtk/gtkhbbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtklist.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtkwindow.h>
 #include <gtk/gtkmain.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkvbox.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
 #include "e-dateedit.h"
 #include "e-calendar.h"
 
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkwindow.h>
 
 
 struct _EDateEditPrivate {
diff --git a/widgets/misc/e-dateedit.h b/widgets/misc/e-dateedit.h
index 8ffb4694f9..a83690844f 100644
--- a/widgets/misc/e-dateedit.h
+++ b/widgets/misc/e-dateedit.h
@@ -42,7 +42,9 @@
 #define __E_DATE_EDIT_H_ 
 
 #include <time.h>
+#include <glib.h>
 #include <gtk/gtkhbox.h>
+#include <gtk/gtkwidget.h>
 #include <libgnome/gnome-defs.h>
  
 BEGIN_GNOME_DECLS
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 61cff2f145..4da78b8001 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -28,6 +28,10 @@
 
 #include <stdio.h> /* printf */
 #include <glib.h>
+#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtkeventbox.h>
+#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkoptionmenu.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include "e-search-bar.h"
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
index f3848ec274..fb67e406a2 100644
--- a/widgets/misc/test-calendar.c
+++ b/widgets/misc/test-calendar.c
@@ -30,6 +30,13 @@
 #include <config.h>
 #endif
 
+
+#include <gtk/gtkbox.h>
+#include <gtk/gtkdnd.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkvbox.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-init.h>
 #include "e-calendar.h"
 
 /* Drag and Drop stuff. */