diff --git a/ChangeLog b/ChangeLog
index a5da085..008d105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-04  Lucas Rocha  <lucasr@cvs.gnome.org>
+
+	* src/calendar.c, src/entry.c, src/fileselection.c,
+	src/msg.c, src/notification.c, src/option.c,
+	src/progress.c, src/text.c, src/tree.c, src/util.c:
+	include cleanups (config.h).
+
 2005-07-04  Lucas Rocha  <lucasr@cvs.gnome.org>
 
 	* THANKS, src/about.c: Update.
diff --git a/po/ChangeLog b/po/ChangeLog
index 258a58b..b28bc1b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-06  Lucas Rocha  <lucasr@cvs.gnome.org>
+
+	* es.po: Fix build problem.
+
 2005-07-06  Marcel Telka  <marcel@telka.sk>
 
 	* sk.po: Updated Slovak translation.
diff --git a/po/es.po b/po/es.po
index f92834c..0b59824 100644
--- a/po/es.po
+++ b/po/es.po
@@ -86,7 +86,7 @@ msgstr ""
 
 #: ../src/tree.c:324
 msgid "You should use only one List dialog type.\n"
-msgstr "Debería usar sólo un tipo de diálogo List.\\n"
+msgstr "Debería usar sólo un tipo de diálogo List.\n"
 
 #: ../src/zenity.glade.h:1
 msgid "*"
diff --git a/src/calendar.c b/src/calendar.c
index 248f3b8..7e9eb9c 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -21,6 +21,8 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
+#include "config.h"
+
 #include <glade/glade.h>
 #include <time.h>
 #include "zenity.h"
diff --git a/src/entry.c b/src/entry.c
index db5b3fe..e8c2585 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -21,6 +21,8 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
+#include "config.h"
+
 #include <glade/glade.h>
 #include "zenity.h"
 #include "util.h"
diff --git a/src/fileselection.c b/src/fileselection.c
index b2144a1..95178ec 100644
--- a/src/fileselection.c
+++ b/src/fileselection.c
@@ -21,7 +21,10 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
+#include "config.h"
+
 #include <glade/glade.h>
+#include <string.h>
 #include "zenity.h"
 #include "util.h"
 
diff --git a/src/msg.c b/src/msg.c
index 0c46c36..b400f0b 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -21,6 +21,8 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
+#include "config.h"
+
 #include <glade/glade.h>
 #include "zenity.h"
 #include "util.h"
diff --git a/src/notification.c b/src/notification.c
index 509d2f8..26600cb 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -21,8 +21,11 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
+#include <config.h>
+
 #include <glade/glade.h>
 #include <time.h>
+#include <string.h>
 #include "zenity.h"
 #include "eggtrayicon.h"
 #include "util.h"
diff --git a/src/option.c b/src/option.c
index b4d35bc..69c83dd 100644
--- a/src/option.c
+++ b/src/option.c
@@ -22,8 +22,12 @@
  *          Lucas Rocha <lucasr@im.ufba.br>
  */
 
+#include "config.h"
+
 #include "option.h"
 #include <time.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* General Options */
 gchar   *zenity_general_dialog_title;
diff --git a/src/progress.c b/src/progress.c
index 8d7b1db..d92d2e2 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -21,6 +21,8 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/text.c b/src/text.c
index 9923cce..151e000 100644
--- a/src/text.c
+++ b/src/text.c
@@ -21,6 +21,8 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
+#include "config.h"
+
 #include <glade/glade.h>
 #include "zenity.h"
 #include "util.h"
diff --git a/src/tree.c b/src/tree.c
index 57e8128..72a9b39 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -23,6 +23,8 @@
  *          Kristian Rietveld <kris@gtk.org>
  */
 
+#include "config.h"
+
 #include <glade/glade.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/util.c b/src/util.c
index 9861e41..f503526 100644
--- a/src/util.c
+++ b/src/util.c
@@ -27,6 +27,8 @@
  *          Tom Tromey <tromey@redhat.com>
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <locale.h>
 #include <errno.h>