diff --git a/ChangeLog b/ChangeLog
index 1d317ad0..27f90ee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-06  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* lib/defines.h: Do not include <config.h>. This complicate
+	undefining some configuration macros when the file is included
+	multiple times.
+	* libmisc/xgetXXbyYY.c, libmisc/xgetpwnam.c, libmisc/xgetpwuid.c,
+	libmisc/xgetgrgid.c, libmisc/xgetgrnam.c, libmisc/xgetspnam.c:
+	Include <config.h> from teh compiled C file, not the included
+	getXXbyYY.c.
+
 2008-09-06  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/userdel.c, src/newusers.c, src/chpasswd.c, src/chfn.c,
diff --git a/lib/defines.h b/lib/defines.h
index 8381d82c..1014ea9d 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -4,8 +4,6 @@
 #ifndef _DEFINES_H_
 #define _DEFINES_H_
 
-#include <config.h>
-
 #if HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
diff --git a/libmisc/xgetXXbyYY.c b/libmisc/xgetXXbyYY.c
index 62c3c3af..db41a18e 100644
--- a/libmisc/xgetXXbyYY.c
+++ b/libmisc/xgetXXbyYY.c
@@ -52,7 +52,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <config.h>
+#include <errno.h>
 #include "prototypes.h"
 
 #define XFUNCTION_NAME XPREFIX (FUNCTION_NAME)
diff --git a/libmisc/xgetgrgid.c b/libmisc/xgetgrgid.c
index 6b9f7f04..f6919740 100644
--- a/libmisc/xgetgrgid.c
+++ b/libmisc/xgetgrgid.c
@@ -49,6 +49,8 @@
  * This file provide wrapper to the getpwnam or getpwnam_r functions.
  */
 
+#include <config.h>
+
 #include "groupio.h"
 
 #define LOOKUP_TYPE	struct group
diff --git a/libmisc/xgetgrnam.c b/libmisc/xgetgrnam.c
index 3a8cbb6d..3f160414 100644
--- a/libmisc/xgetgrnam.c
+++ b/libmisc/xgetgrnam.c
@@ -49,6 +49,8 @@
  * This file provide wrapper to the getpwnam or getpwnam_r functions.
  */
 
+#include <config.h>
+
 #include "groupio.h"
 
 #define LOOKUP_TYPE	struct group
diff --git a/libmisc/xgetpwnam.c b/libmisc/xgetpwnam.c
index da5f1c78..6b59248d 100644
--- a/libmisc/xgetpwnam.c
+++ b/libmisc/xgetpwnam.c
@@ -49,6 +49,8 @@
  * This file provide wrapper to the getpwnam or getpwnam_r functions.
  */
 
+#include <config.h>
+
 #include "pwio.h"
 
 #define LOOKUP_TYPE	struct passwd
diff --git a/libmisc/xgetpwuid.c b/libmisc/xgetpwuid.c
index 6f652e73..f0fb04c9 100644
--- a/libmisc/xgetpwuid.c
+++ b/libmisc/xgetpwuid.c
@@ -49,6 +49,8 @@
  * This file provide wrapper to the getpwnam or getpwnam_r functions.
  */
 
+#include <config.h>
+
 #include "pwio.h"
 
 #define LOOKUP_TYPE	struct passwd
diff --git a/libmisc/xgetspnam.c b/libmisc/xgetspnam.c
index abfa95fd..1705139a 100644
--- a/libmisc/xgetspnam.c
+++ b/libmisc/xgetspnam.c
@@ -49,6 +49,8 @@
  * This file provide wrapper to the getpwnam or getpwnam_r functions.
  */
 
+#include <config.h>
+
 #include "shadowio.h"
 
 #define LOOKUP_TYPE	struct spwd