10 files changed, 36 insertions, 4 deletions
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index bbd2aacfd0..163270f24d 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -16,6 +16,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-actions.h"
 #include "e-composer-private.h"
 
diff --git a/composer/e-composer-activity.c b/composer/e-composer-activity.c
index 6c285f2c1a..ee46d9b6b0 100644
--- a/composer/e-composer-activity.c
+++ b/composer/e-composer-activity.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-private.h"
 
 struct _EComposerActivityPrivate {
diff --git a/composer/e-composer-common.h b/composer/e-composer-common.h
index 28affba2ad..661797eee6 100644
--- a/composer/e-composer-common.h
+++ b/composer/e-composer-common.h
@@ -21,10 +21,6 @@
 #ifndef E_COMPOSER_COMMON
 #define E_COMPOSER_COMMON
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gtk/gtk.h>
 
 #endif /* E_COMPOSER_COMMON */
diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c
index 856d36a1e8..0b569717c2 100644
--- a/composer/e-composer-from-header.c
+++ b/composer/e-composer-from-header.c
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-from-header.h"
 
 /* Convenience macro */
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index efac8a1d31..78404a62e7 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -15,6 +15,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-header-table.h"
 
 #include <string.h>
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index f3f2f2833b..d6a270a73b 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-header.h"
 
 #include <glib/gi18n.h>
diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index 3589dea291..dcaecab464 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-msg-composer.h"
 #include "e-composer-name-header.h"
 
diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c
index 000ed7c55c..fd08c67d64 100644
--- a/composer/e-composer-post-header.c
+++ b/composer/e-composer-post-header.c
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-post-header.h"
 
 #include <string.h>
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 46206a4cca..08cdd47e1f 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -17,6 +17,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-private.h"
 #include "e-util/e-util-private.h"
 
diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
index d92901d55e..28df51ec87 100644
--- a/composer/e-composer-text-header.c
+++ b/composer/e-composer-text-header.c
@@ -19,6 +19,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-composer-text-header.h"
 
 /* Convenience macro */