Resolves: #214533

Summary: configure needs to support --with-fhs (Comment #6)
Changes: Added the following include next to the end of the copyright block.
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+

64 files changed, 320 insertions, 0 deletions

diff --git a/include/base/crit.h b/include/base/crit.h
index cb98d5d1..b4f51977 100644
--- a/include/base/crit.h
+++ b/include/base/crit.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef BASE_CRIT_H
 #define BASE_CRIT_H
 
diff --git a/include/base/dbtbase.h b/include/base/dbtbase.h
index 460b5caf..380bfa06 100644
--- a/include/base/dbtbase.h
+++ b/include/base/dbtbase.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #define LIBRARY_NAME "base"
 
 static char dbtbaseid[] = "$DBT: base referenced v1 $";
diff --git a/include/base/ereport.h b/include/base/ereport.h
index a097a939..e97be14e 100644
--- a/include/base/ereport.h
+++ b/include/base/ereport.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef BASE_EREPORT_H
 #define BASE_EREPORT_H
 
diff --git a/include/base/eventhandler.h b/include/base/eventhandler.h
index ac8597dc..f4de0c29 100644
--- a/include/base/eventhandler.h
+++ b/include/base/eventhandler.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * eventhandler.h: Handle registration of event handlers
  *
diff --git a/include/base/eventlog.h b/include/base/eventlog.h
index c1e748de..5e6c6ac4 100644
--- a/include/base/eventlog.h
+++ b/include/base/eventlog.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 // EVENTLOG.H
 //
 // This file contains the defines that make NT an installable service.
diff --git a/include/base/file.h b/include/base/file.h
index 4ad5de2e..496c33e7 100644
--- a/include/base/file.h
+++ b/include/base/file.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef BASE_FILE_H
 #define BASE_FILE_H
 
diff --git a/include/base/fsmutex.h b/include/base/fsmutex.h
index f5fe2422..5eca55c2 100644
--- a/include/base/fsmutex.h
+++ b/include/base/fsmutex.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * fsmutex: Mutexes that are filesystem-based so they're available from more
  * than one process and address space
diff --git a/include/base/lexer.h b/include/base/lexer.h
index 30a29b5e..e8fd8bb9 100644
--- a/include/base/lexer.h
+++ b/include/base/lexer.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __lexer_h
 #define __lexer_h
 
diff --git a/include/base/nterr.h b/include/base/nterr.h
index ead6eca7..90446e76 100644
--- a/include/base/nterr.h
+++ b/include/base/nterr.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * Added function prototypes for nterror stuff.
  *
diff --git a/include/base/nterrors.h b/include/base/nterrors.h
index c81f355c..895e26c5 100644
--- a/include/base/nterrors.h
+++ b/include/base/nterrors.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /* DO NOT EDIT THIS FILE - it is automatically generated */
 
 typedef struct _NtError {
diff --git a/include/base/plist.h b/include/base/plist.h
index aff540a0..06cffcbc 100644
--- a/include/base/plist.h
+++ b/include/base/plist.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _PLIST_H
 #define _PLIST_H
 
diff --git a/include/base/pool.h b/include/base/pool.h
index 767eb6eb..30990fce 100644
--- a/include/base/pool.h
+++ b/include/base/pool.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef BASE_POOL_H
 #define BASE_POOL_H
 
diff --git a/include/base/rwlock.h b/include/base/rwlock.h
index 3ca1ffa0..5b5d67b6 100644
--- a/include/base/rwlock.h
+++ b/include/base/rwlock.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * rwlock.h: Shared/Exclusive lock abstraction. 
  * 
diff --git a/include/base/shexp.h b/include/base/shexp.h
index 17856b5e..fb087955 100644
--- a/include/base/shexp.h
+++ b/include/base/shexp.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef BASE_SHEXP_H
 #define BASE_SHEXP_H
 
diff --git a/include/base/systems.h b/include/base/systems.h
index d1403aa0..1b6d41d0 100644
--- a/include/base/systems.h
+++ b/include/base/systems.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef BASE_SYSTEMS_H
 #define BASE_SYSTEMS_H
 
diff --git a/include/base/systhr.h b/include/base/systhr.h
index 098c13e9..20cc4ad5 100644
--- a/include/base/systhr.h
+++ b/include/base/systhr.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef BASE_SYSTHR_H
 #define BASE_SYSTHR_H
 
diff --git a/include/base/util.h b/include/base/util.h
index 3302a1cf..10a59d69 100644
--- a/include/base/util.h
+++ b/include/base/util.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef BASE_UTIL_H
 #define BASE_UTIL_H
 
diff --git a/include/i18n.h b/include/i18n.h
index 27cbde11..aa76997c 100644
--- a/include/i18n.h
+++ b/include/i18n.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef I18N_H
 #define I18N_H
 
diff --git a/include/ldaputil/cert.h b/include/ldaputil/cert.h
index d7307cf6..051940ce 100644
--- a/include/ldaputil/cert.h
+++ b/include/ldaputil/cert.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _LDAPU_CERT_H
 #define _LDAPU_CERT_H
 
diff --git a/include/ldaputil/certmap.h b/include/ldaputil/certmap.h
index 6fc81c89..4320ff48 100644
--- a/include/ldaputil/certmap.h
+++ b/include/ldaputil/certmap.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _LDAPU_CERTMAP_H
 #define _LDAPU_CERTMAP_H
 
diff --git a/include/ldaputil/dbconf.h b/include/ldaputil/dbconf.h
index c430c94e..b6dd1ed0 100644
--- a/include/ldaputil/dbconf.h
+++ b/include/ldaputil/dbconf.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _LDAPU_DBCONF_H
 #define _LDAPU_DBCONF_H
 
diff --git a/include/ldaputil/encode.h b/include/ldaputil/encode.h
index 0c3a4a07..5aa63b70 100644
--- a/include/ldaputil/encode.h
+++ b/include/ldaputil/encode.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _LDAPU_ENCODE_H
 #define _LDAPU_ENCODE_H
 
diff --git a/include/ldaputil/errors.h b/include/ldaputil/errors.h
index 6dd074ec..7b36a472 100644
--- a/include/ldaputil/errors.h
+++ b/include/ldaputil/errors.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _LDAPU_ERRORS_H
 #define _LDAPU_ERRORS_H
 
diff --git a/include/ldaputil/extcmap.h b/include/ldaputil/extcmap.h
index aae63066..0327135c 100644
--- a/include/ldaputil/extcmap.h
+++ b/include/ldaputil/extcmap.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _PUBLIC_CERTMAP_H
 #define _PUBLIC_CERTMAP_H
 
diff --git a/include/ldaputil/init.h b/include/ldaputil/init.h
index f51d3bf3..a1fdc9db 100644
--- a/include/ldaputil/init.h
+++ b/include/ldaputil/init.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _LDAPU_INIT_H
 #define _LDAPU_INIT_H
 
diff --git a/include/ldaputil/ldapauth.h b/include/ldaputil/ldapauth.h
index bc3b73ae..c2c7f99b 100644
--- a/include/ldaputil/ldapauth.h
+++ b/include/ldaputil/ldapauth.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef LDAPU_AUTH_H
 #define LDAPU_AUTH_H
 
diff --git a/include/ldaputil/ldapdb.h b/include/ldaputil/ldapdb.h
index 6f326d22..5a768f59 100644
--- a/include/ldaputil/ldapdb.h
+++ b/include/ldaputil/ldapdb.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _LDAPU_LDAPDB_H
 #define _LDAPU_LDAPDB_H
 
diff --git a/include/ldaputil/ldaputil.h b/include/ldaputil/ldaputil.h
index 35b9a640..4cb05e6a 100644
--- a/include/ldaputil/ldaputil.h
+++ b/include/ldaputil/ldaputil.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _LDAPU_LDAPUTIL_H
 #define _LDAPU_LDAPUTIL_H
 
diff --git a/include/libaccess/acl.h b/include/libaccess/acl.h
index 253fa4f8..c3f61eaa 100644
--- a/include/libaccess/acl.h
+++ b/include/libaccess/acl.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef ACL_HEADER
 #define ACL_HEADER
 
diff --git a/include/libaccess/aclerror.h b/include/libaccess/aclerror.h
index 771ffeb7..add1d000 100644
--- a/include/libaccess/aclerror.h
+++ b/include/libaccess/aclerror.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __aclerror_h
 #define __aclerror_h
 
diff --git a/include/libaccess/acleval.h b/include/libaccess/acleval.h
index ce9750e5..15e1f5e0 100644
--- a/include/libaccess/acleval.h
+++ b/include/libaccess/acleval.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __acleval_h
 #define __acleval_h
 
diff --git a/include/libaccess/aclglobal.h b/include/libaccess/aclglobal.h
index 0ddd06ee..bd903502 100644
--- a/include/libaccess/aclglobal.h
+++ b/include/libaccess/aclglobal.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
 **	Header file containing global data elements.  These are duplicated
 **	when a cache flush is done.
diff --git a/include/libaccess/aclproto.h b/include/libaccess/aclproto.h
index 57f8137e..68ef3d80 100644
--- a/include/libaccess/aclproto.h
+++ b/include/libaccess/aclproto.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef ACL_PROTO_HEADER
 #define ACL_PROTO_HEADER
 
diff --git a/include/libaccess/aclstruct.h b/include/libaccess/aclstruct.h
index 7e9c7a30..6d464ffc 100644
--- a/include/libaccess/aclstruct.h
+++ b/include/libaccess/aclstruct.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __aclstruct_h
 #define __aclstruct_h
 
diff --git a/include/libaccess/attrec.h b/include/libaccess/attrec.h
index 09fd9f68..21a6a57b 100644
--- a/include/libaccess/attrec.h
+++ b/include/libaccess/attrec.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __attrec_h
 #define __attrec_h
 
diff --git a/include/libaccess/authdb.h b/include/libaccess/authdb.h
index 97c2e5a6..34588c8a 100644
--- a/include/libaccess/authdb.h
+++ b/include/libaccess/authdb.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef AUTHDB_H
 #define AUTHDB_H
 
diff --git a/include/libaccess/dbtlibaccess.h b/include/libaccess/dbtlibaccess.h
index dc902675..1bc39824 100644
--- a/include/libaccess/dbtlibaccess.h
+++ b/include/libaccess/dbtlibaccess.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #define LIBRARY_NAME "libaccess"
 
 static char dbtlibaccessid[] = "$DBT: libaccess referenced v1 $";
diff --git a/include/libaccess/dnfstruct.h b/include/libaccess/dnfstruct.h
index 2c2502d7..f87ea0e5 100644
--- a/include/libaccess/dnfstruct.h
+++ b/include/libaccess/dnfstruct.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __dnfstruct_h
 #define __dnfstruct_h
 
diff --git a/include/libaccess/ipfstruct.h b/include/libaccess/ipfstruct.h
index 37d1d7c6..d67bbbe1 100644
--- a/include/libaccess/ipfstruct.h
+++ b/include/libaccess/ipfstruct.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __ipfstruct_h
 #define __ipfstruct_h
 
diff --git a/include/libaccess/las.h b/include/libaccess/las.h
index c2127f83..2e5673d7 100644
--- a/include/libaccess/las.h
+++ b/include/libaccess/las.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef ACL_LAS_HEADER
 #define ACL_LAS_HEADER
 
diff --git a/include/libaccess/ldapacl.h b/include/libaccess/ldapacl.h
index 881d42b3..39731e61 100644
--- a/include/libaccess/ldapacl.h
+++ b/include/libaccess/ldapacl.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef ACL_AUTH_H
 #define ACL_AUTH_H
 
diff --git a/include/libaccess/nsauth.h b/include/libaccess/nsauth.h
index 360485db..b859fae7 100644
--- a/include/libaccess/nsauth.h
+++ b/include/libaccess/nsauth.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __nsauth_h
 #define __nsauth_h
 
diff --git a/include/libaccess/nsautherr.h b/include/libaccess/nsautherr.h
index a73b6539..325e0373 100644
--- a/include/libaccess/nsautherr.h
+++ b/include/libaccess/nsautherr.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __nsautherr_h
 #define __nsautherr_h
 
diff --git a/include/libaccess/nserror.h b/include/libaccess/nserror.h
index b09d04f4..f6b5ef2a 100644
--- a/include/libaccess/nserror.h
+++ b/include/libaccess/nserror.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __nserror_h
 #define __nserror_h
 
diff --git a/include/libaccess/symbols.h b/include/libaccess/symbols.h
index 7a30f28a..73d04a49 100644
--- a/include/libaccess/symbols.h
+++ b/include/libaccess/symbols.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __symbols_h
 #define __symbols_h
 
diff --git a/include/libaccess/userauth.h b/include/libaccess/userauth.h
index 3766d26a..6dd19fad 100644
--- a/include/libaccess/userauth.h
+++ b/include/libaccess/userauth.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef USERAUTH_H
 #define USERAUTH_H
 
diff --git a/include/libaccess/usi.h b/include/libaccess/usi.h
index 2a51d85b..7649819c 100644
--- a/include/libaccess/usi.h
+++ b/include/libaccess/usi.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __usi_h
 #define __usi_h
 
diff --git a/include/libaccess/usrcache.h b/include/libaccess/usrcache.h
index 5021b0bb..dfb73a1a 100644
--- a/include/libaccess/usrcache.h
+++ b/include/libaccess/usrcache.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef ACL_USER_CACHE_H
 #define ACL_USER_CACHE_H
 
diff --git a/include/libadmin/dbtlibadmin.h b/include/libadmin/dbtlibadmin.h
index 43acf214..cc4e0957 100644
--- a/include/libadmin/dbtlibadmin.h
+++ b/include/libadmin/dbtlibadmin.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #define LIBRARY_NAME "libadmin"
 
 static char dbtlibadminid[] = "$DBT: libadmin referenced v1 $";
diff --git a/include/libadmin/libadmin.h b/include/libadmin/libadmin.h
index 70631795..05d0b090 100644
--- a/include/libadmin/libadmin.h
+++ b/include/libadmin/libadmin.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /* 
  * libadmin.h - All functions contained in libadmin.a
  *
diff --git a/include/netsite.h b/include/netsite.h
index 2b7db9d6..78e7d6a7 100644
--- a/include/netsite.h
+++ b/include/netsite.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef NETSITE_H
 #define NETSITE_H
 
diff --git a/include/nt/messages.h b/include/nt/messages.h
index ee519ba9..35fda4d3 100644
--- a/include/nt/messages.h
+++ b/include/nt/messages.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
  /*
  Microsoft Developer Support
  Copyright (c) 1992 Microsoft Corporation
diff --git a/include/nt/nsapi.h b/include/nt/nsapi.h
index 09d4e134..460293ef 100644
--- a/include/nt/nsapi.h
+++ b/include/nt/nsapi.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * Aruna Victor
  */
diff --git a/include/nt/ntos.h b/include/nt/ntos.h
index 7d129d6c..7d971b7e 100644
--- a/include/nt/ntos.h
+++ b/include/nt/ntos.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /**********************************************************************
  *  ntOS.h - functionality used bt NT Operating System
  *
diff --git a/include/nt/regparms.h b/include/nt/regparms.h
index 8dcbc6ed..ccee49a8 100644
--- a/include/nt/regparms.h
+++ b/include/nt/regparms.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 //                                                                          //
 //  Name: regparms.h                                                        //
 //	Platforms: WIN32                                                        //
diff --git a/include/nt/resource.h b/include/nt/resource.h
index 2dcd3278..ce706980 100644
--- a/include/nt/resource.h
+++ b/include/nt/resource.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by netsite.rc
diff --git a/include/public/base/systems.h b/include/public/base/systems.h
index cdd9fc79..fc9b045e 100644
--- a/include/public/base/systems.h
+++ b/include/public/base/systems.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef PUBLIC_BASE_SYSTEMS_H
 #define PUBLIC_BASE_SYSTEMS_H
 
diff --git a/include/public/netsite.h b/include/public/netsite.h
index 643f2da8..f6ff012b 100644
--- a/include/public/netsite.h
+++ b/include/public/netsite.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef PUBLIC_NETSITE_H
 #define PUBLIC_NETSITE_H
 
diff --git a/include/public/nsacl/aclapi.h b/include/public/nsacl/aclapi.h
index 3180eb76..197d9d38 100644
--- a/include/public/nsacl/aclapi.h
+++ b/include/public/nsacl/aclapi.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef PUBLIC_NSACL_ACLAPI_H
 #define PUBLIC_NSACL_ACLAPI_H
 
diff --git a/include/public/nsacl/acldef.h b/include/public/nsacl/acldef.h
index 4e9a0b74..b3e9f4d1 100644
--- a/include/public/nsacl/acldef.h
+++ b/include/public/nsacl/acldef.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef PUBLIC_NSACL_ACLDEF_H
 #define PUBLIC_NSACL_ACLDEF_H
 
diff --git a/include/public/nsacl/nserrdef.h b/include/public/nsacl/nserrdef.h
index 4850e8bb..96857f47 100644
--- a/include/public/nsacl/nserrdef.h
+++ b/include/public/nsacl/nserrdef.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef PUBLIC_NSACL_NSERRDEF_H
 #define PUBLIC_NSACL_NSERRDEF_H
 
diff --git a/include/public/nsacl/plistdef.h b/include/public/nsacl/plistdef.h
index f991f1f3..ac61f516 100644
--- a/include/public/nsacl/plistdef.h
+++ b/include/public/nsacl/plistdef.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef PUBLIC_NSACL_PLISTDEF_H
 #define PUBLIC_NSACL_PLISTDEF_H
 
diff --git a/include/public/nsapi.h b/include/public/nsapi.h
index 9e4c13e9..c3f17485 100644
--- a/include/public/nsapi.h
+++ b/include/public/nsapi.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef PUBLIC_NSAPI_H
 #define PUBLIC_NSAPI_H
 
diff --git a/include/version.h b/include/version.h
index 80237258..e28bf2ea 100644
--- a/include/version.h
+++ b/include/version.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
    This file is included from both C source and the NT installation compiler.
    Because of that, no ifdefs are allowed, and strings must be simple strings