From 8a9328e37b8c63d60583184dc8dab12f85810682 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Mon, 18 May 2015 16:26:02 +0200
Subject: build: do not #include "config.h" in each file

Instead of including config.h in each file, and have the additional
config.h included from the compiler commandline (-include option).

When a .c file tests for a certain #define, and config.h was not
included, incorrect assumtions were made. With this change, it can not
happen again.

BUG: 1222319
Change-Id: I4f9097b8740b81ecfe8b218d52ca50361f74cb64
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/10808
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
---
 libglusterfs/src/call-stub.c                   | 5 -----
 libglusterfs/src/call-stub.h                   | 5 -----
 libglusterfs/src/client_t.c                    | 5 -----
 libglusterfs/src/client_t.h                    | 5 -----
 libglusterfs/src/cluster-syncop.h              | 5 -----
 libglusterfs/src/common-utils.c                | 5 -----
 libglusterfs/src/common-utils.h                | 5 -----
 libglusterfs/src/compat-errno.c                | 5 -----
 libglusterfs/src/compat-errno.h                | 5 -----
 libglusterfs/src/compat.c                      | 5 -----
 libglusterfs/src/compat.h                      | 5 -----
 libglusterfs/src/ctx.c                         | 5 -----
 libglusterfs/src/daemon.h                      | 5 -----
 libglusterfs/src/defaults.c                    | 5 -----
 libglusterfs/src/defaults.h                    | 5 -----
 libglusterfs/src/dict.c                        | 5 -----
 libglusterfs/src/dict.h                        | 5 -----
 libglusterfs/src/event-epoll.c                 | 5 -----
 libglusterfs/src/event-history.h               | 5 -----
 libglusterfs/src/event-poll.c                  | 5 -----
 libglusterfs/src/event.c                       | 5 -----
 libglusterfs/src/event.h                       | 5 -----
 libglusterfs/src/fd.c                          | 5 -----
 libglusterfs/src/fd.h                          | 5 -----
 libglusterfs/src/gf-dirent.c                   | 5 -----
 libglusterfs/src/gf-dirent.h                   | 5 -----
 libglusterfs/src/gfdb/gfdb_data_store.h        | 5 -----
 libglusterfs/src/gfdb/gfdb_data_store_types.h  | 5 -----
 libglusterfs/src/gfdb/gfdb_sqlite3.h           | 5 -----
 libglusterfs/src/gfdb/gfdb_sqlite3_helper.h    | 5 -----
 libglusterfs/src/glfs-message-id.h             | 5 -----
 libglusterfs/src/globals.c                     | 5 -----
 libglusterfs/src/glusterfs.h                   | 5 -----
 libglusterfs/src/graph-print.c                 | 5 -----
 libglusterfs/src/graph.c                       | 5 -----
 libglusterfs/src/hashfn.c                      | 5 -----
 libglusterfs/src/hashfn.h                      | 5 -----
 libglusterfs/src/iatt.h                        | 5 -----
 libglusterfs/src/inode.c                       | 5 -----
 libglusterfs/src/inode.h                       | 5 -----
 libglusterfs/src/lkowner.h                     | 5 -----
 libglusterfs/src/locking.h                     | 5 -----
 libglusterfs/src/logging.c                     | 5 -----
 libglusterfs/src/logging.h                     | 5 -----
 libglusterfs/src/lvm-defaults.h                | 5 -----
 libglusterfs/src/options.c                     | 5 -----
 libglusterfs/src/options.h                     | 5 -----
 libglusterfs/src/stack.h                       | 5 -----
 libglusterfs/src/store.c                       | 5 -----
 libglusterfs/src/store.h                       | 5 -----
 libglusterfs/src/strfd.c                       | 5 -----
 libglusterfs/src/syncop-utils.c                | 5 -----
 libglusterfs/src/syncop.c                      | 5 -----
 libglusterfs/src/syncop.h                      | 5 -----
 libglusterfs/src/syscall.c                     | 5 -----
 libglusterfs/src/template-component-messages.h | 5 -----
 libglusterfs/src/timer.c                       | 5 -----
 libglusterfs/src/timer.h                       | 5 -----
 libglusterfs/src/trie.h                        | 5 -----
 libglusterfs/src/xlator.c                      | 5 -----
 libglusterfs/src/xlator.h                      | 5 -----
 61 files changed, 305 deletions(-)

(limited to 'libglusterfs')

diff --git a/libglusterfs/src/call-stub.c b/libglusterfs/src/call-stub.c
index 128dcf9e15f..911ea334909 100644
--- a/libglusterfs/src/call-stub.c
+++ b/libglusterfs/src/call-stub.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <openssl/md5.h>
 #include <inttypes.h>
 
diff --git a/libglusterfs/src/call-stub.h b/libglusterfs/src/call-stub.h
index 954338be915..af4a2f55aff 100644
--- a/libglusterfs/src/call-stub.h
+++ b/libglusterfs/src/call-stub.h
@@ -11,11 +11,6 @@
 #ifndef _CALL_STUB_H_
 #define _CALL_STUB_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include "defaults.h"
 #include "stack.h"
diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c
index 84257e66b09..9e6c90eba41 100644
--- a/libglusterfs/src/client_t.c
+++ b/libglusterfs/src/client_t.c
@@ -16,11 +16,6 @@
 #include "rpcsvc.h"
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 static int
 gf_client_chain_client_entries (cliententry_t *entries, uint32_t startidx,
                         uint32_t endcount)
diff --git a/libglusterfs/src/client_t.h b/libglusterfs/src/client_t.h
index 64c0514c8ac..bfea62061bd 100644
--- a/libglusterfs/src/client_t.h
+++ b/libglusterfs/src/client_t.h
@@ -11,11 +11,6 @@
 #ifndef _CLIENT_T_H
 #define _CLIENT_T_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glusterfs.h"
 #include "locking.h"  /* for gf_lock_t, not included by glusterfs.h */
 
diff --git a/libglusterfs/src/cluster-syncop.h b/libglusterfs/src/cluster-syncop.h
index a681951c27d..3712259c65b 100644
--- a/libglusterfs/src/cluster-syncop.h
+++ b/libglusterfs/src/cluster-syncop.h
@@ -12,11 +12,6 @@
 #ifndef _CLUSTER_SYNCOP_H
 #define _CLUSTER_SYNCOP_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include <sys/time.h>
 #include <pthread.h>
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index 4bcef6ae33f..bda336e348a 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
 #else
diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h
index c361405d5eb..6691259f518 100644
--- a/libglusterfs/src/common-utils.h
+++ b/libglusterfs/src/common-utils.h
@@ -11,11 +11,6 @@
 #ifndef _COMMON_UTILS_H
 #define _COMMON_UTILS_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 #include <sys/uio.h>
 #include <netdb.h>
diff --git a/libglusterfs/src/compat-errno.c b/libglusterfs/src/compat-errno.c
index d8ab82a5d20..3674596ad71 100644
--- a/libglusterfs/src/compat-errno.c
+++ b/libglusterfs/src/compat-errno.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 
 #include "compat-errno.h"
diff --git a/libglusterfs/src/compat-errno.h b/libglusterfs/src/compat-errno.h
index 65e52081dd3..6f46157e697 100644
--- a/libglusterfs/src/compat-errno.h
+++ b/libglusterfs/src/compat-errno.h
@@ -11,11 +11,6 @@
 #ifndef __COMPAT_ERRNO_H__
 #define __COMPAT_ERRNO_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <errno.h>
 
 #define GF_ERROR_CODE_SUCCESS         0
diff --git a/libglusterfs/src/compat.c b/libglusterfs/src/compat.c
index 93e7b45a69e..0538a3298cb 100644
--- a/libglusterfs/src/compat.c
+++ b/libglusterfs/src/compat.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
index 1522257dffe..458a751c2f4 100644
--- a/libglusterfs/src/compat.h
+++ b/libglusterfs/src/compat.h
@@ -11,11 +11,6 @@
 #ifndef __COMPAT_H__
 #define __COMPAT_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 #include "dict.h"
 
diff --git a/libglusterfs/src/ctx.c b/libglusterfs/src/ctx.c
index aa9d4216fd3..c70d97bc5d4 100644
--- a/libglusterfs/src/ctx.c
+++ b/libglusterfs/src/ctx.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif /* !_CONFIG_H */
-
 #include <pthread.h>
 #include "globals.h"
 
diff --git a/libglusterfs/src/daemon.h b/libglusterfs/src/daemon.h
index 80836a326d5..95e134b78b0 100644
--- a/libglusterfs/src/daemon.h
+++ b/libglusterfs/src/daemon.h
@@ -11,11 +11,6 @@
 #ifndef _DAEMON_H
 #define _DAEMON_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #define DEVNULLPATH "/dev/null"
 
 int os_daemon_return(int nochdir, int noclose);
diff --git a/libglusterfs/src/defaults.c b/libglusterfs/src/defaults.c
index 1414da90731..b7174c8a939 100644
--- a/libglusterfs/src/defaults.c
+++ b/libglusterfs/src/defaults.c
@@ -20,11 +20,6 @@
    All the functions are plain enough to understand.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include "defaults.h"
 
diff --git a/libglusterfs/src/defaults.h b/libglusterfs/src/defaults.h
index a4ec7625409..68d23974b35 100644
--- a/libglusterfs/src/defaults.h
+++ b/libglusterfs/src/defaults.h
@@ -15,11 +15,6 @@
 #ifndef _DEFAULTS_H
 #define _DEFAULTS_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 
 typedef struct {
diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c
index ffc92e72724..23e25b16edc 100644
--- a/libglusterfs/src/dict.c
+++ b/libglusterfs/src/dict.c
@@ -16,11 +16,6 @@
 #include <limits.h>
 #include <fnmatch.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glusterfs.h"
 #include "common-utils.h"
 #include "dict.h"
diff --git a/libglusterfs/src/dict.h b/libglusterfs/src/dict.h
index a9004e96a50..46cb2a3ca55 100644
--- a/libglusterfs/src/dict.h
+++ b/libglusterfs/src/dict.h
@@ -11,11 +11,6 @@
 #ifndef _DICT_H
 #define _DICT_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <inttypes.h>
 #include <sys/uio.h>
 #include <pthread.h>
diff --git a/libglusterfs/src/event-epoll.c b/libglusterfs/src/event-epoll.c
index 92420f3734e..9703fdc0f3d 100644
--- a/libglusterfs/src/event-epoll.c
+++ b/libglusterfs/src/event-epoll.c
@@ -21,11 +21,6 @@
 #include "mem-pool.h"
 #include "common-utils.h"
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 #ifdef HAVE_SYS_EPOLL_H
 #include <sys/epoll.h>
diff --git a/libglusterfs/src/event-history.h b/libglusterfs/src/event-history.h
index b64f63b5eb4..de5d47cdfee 100644
--- a/libglusterfs/src/event-history.h
+++ b/libglusterfs/src/event-history.h
@@ -11,11 +11,6 @@
 #ifndef _EH_H
 #define _EH_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "mem-types.h"
 #include "circ-buff.h"
 
diff --git a/libglusterfs/src/event-poll.c b/libglusterfs/src/event-poll.c
index 0daceb0d5a6..b32d38f6aa6 100644
--- a/libglusterfs/src/event-poll.c
+++ b/libglusterfs/src/event-poll.c
@@ -21,11 +21,6 @@
 #include "mem-pool.h"
 #include "common-utils.h"
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 
 struct event_slot_poll {
diff --git a/libglusterfs/src/event.c b/libglusterfs/src/event.c
index 35564e46ea8..ab93f6c1f12 100644
--- a/libglusterfs/src/event.c
+++ b/libglusterfs/src/event.c
@@ -21,11 +21,6 @@
 #include "mem-pool.h"
 #include "common-utils.h"
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 
 struct event_pool *
diff --git a/libglusterfs/src/event.h b/libglusterfs/src/event.h
index eac57bc01ad..b01ef24bb8e 100644
--- a/libglusterfs/src/event.h
+++ b/libglusterfs/src/event.h
@@ -11,11 +11,6 @@
 #ifndef _EVENT_H_
 #define _EVENT_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <pthread.h>
 
 struct event_pool;
diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c
index 613f9017b0d..1a191f340eb 100644
--- a/libglusterfs/src/fd.c
+++ b/libglusterfs/src/fd.c
@@ -15,11 +15,6 @@
 #include "statedump.h"
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 static int
 gf_fd_fdtable_expand (fdtable_t *fdtable, uint32_t nr);
diff --git a/libglusterfs/src/fd.h b/libglusterfs/src/fd.h
index c1b9157d882..5a98ec38ca7 100644
--- a/libglusterfs/src/fd.h
+++ b/libglusterfs/src/fd.h
@@ -11,11 +11,6 @@
 #ifndef _FD_H
 #define _FD_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "list.h"
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/libglusterfs/src/gf-dirent.c b/libglusterfs/src/gf-dirent.c
index 99c0eb6441d..c602d08b278 100644
--- a/libglusterfs/src/gf-dirent.c
+++ b/libglusterfs/src/gf-dirent.c
@@ -9,11 +9,6 @@
 */
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 #include <stdio.h>
 #include <string.h>
diff --git a/libglusterfs/src/gf-dirent.h b/libglusterfs/src/gf-dirent.h
index faeaf411941..098a66ace15 100644
--- a/libglusterfs/src/gf-dirent.h
+++ b/libglusterfs/src/gf-dirent.h
@@ -12,11 +12,6 @@
 #ifndef _GF_DIRENT_H
 #define _GF_DIRENT_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "iatt.h"
 #include "inode.h"
 
diff --git a/libglusterfs/src/gfdb/gfdb_data_store.h b/libglusterfs/src/gfdb/gfdb_data_store.h
index 977794df5cb..57f3de18f1c 100644
--- a/libglusterfs/src/gfdb/gfdb_data_store.h
+++ b/libglusterfs/src/gfdb/gfdb_data_store.h
@@ -11,11 +11,6 @@
 #define __GFDB_DATA_STORE_H
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glusterfs.h"
 #include "xlator.h"
 #include "logging.h"
diff --git a/libglusterfs/src/gfdb/gfdb_data_store_types.h b/libglusterfs/src/gfdb/gfdb_data_store_types.h
index 72a1c89a741..5f6650dd910 100644
--- a/libglusterfs/src/gfdb/gfdb_data_store_types.h
+++ b/libglusterfs/src/gfdb/gfdb_data_store_types.h
@@ -11,11 +11,6 @@
 #define __GFDB_DATA_STORE_TYPE_H
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <time.h>
 #include <sys/time.h>
 #include <string.h>
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.h b/libglusterfs/src/gfdb/gfdb_sqlite3.h
index 04bfde7fa38..5b6921eafe2 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3.h
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3.h
@@ -11,11 +11,6 @@
 #define __GFDB_SQLITE3_H
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 /*Sqlite3 header file*/
 #include <sqlite3.h>
 
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.h b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.h
index 8b62be1d4d0..0d222305d01 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.h
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.h
@@ -11,11 +11,6 @@
 #define __GFDB_SQLITE3_HELPER_H
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "gfdb_sqlite3.h"
 
 /******************************************************************************
diff --git a/libglusterfs/src/glfs-message-id.h b/libglusterfs/src/glfs-message-id.h
index 0cd035f875f..f6ee181768c 100644
--- a/libglusterfs/src/glfs-message-id.h
+++ b/libglusterfs/src/glfs-message-id.h
@@ -11,11 +11,6 @@
 #ifndef _GLFS_MESSAGE_ID_H_
 #define _GLFS_MESSAGE_ID_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 /* Base of all message IDs, all message IDs would be
  * greater than this */
 #define GLFS_MSGID_BASE         100000
diff --git a/libglusterfs/src/globals.c b/libglusterfs/src/globals.c
index bd1165ec50c..a875049dfec 100644
--- a/libglusterfs/src/globals.c
+++ b/libglusterfs/src/globals.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif /* !_CONFIG_H */
-
 #include <pthread.h>
 
 #include "glusterfs.h"
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h
index 6f20185f80b..10e22af004e 100644
--- a/libglusterfs/src/glusterfs.h
+++ b/libglusterfs/src/glusterfs.h
@@ -11,11 +11,6 @@
 #ifndef _GLUSTERFS_H
 #define _GLUSTERFS_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/libglusterfs/src/graph-print.c b/libglusterfs/src/graph-print.c
index d860d63b308..d352cc798b8 100644
--- a/libglusterfs/src/graph-print.c
+++ b/libglusterfs/src/graph-print.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/uio.h>
 
 #include "common-utils.h"
diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c
index 709ec3b3ce3..e3a864bf111 100644
--- a/libglusterfs/src/graph.c
+++ b/libglusterfs/src/graph.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include <dlfcn.h>
 #include <netdb.h>
diff --git a/libglusterfs/src/hashfn.c b/libglusterfs/src/hashfn.c
index f79165b221e..62f7ab87800 100644
--- a/libglusterfs/src/hashfn.c
+++ b/libglusterfs/src/hashfn.c
@@ -11,11 +11,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "hashfn.h"
 
 #define get16bits(d) (*((const uint16_t *) (d)))
diff --git a/libglusterfs/src/hashfn.h b/libglusterfs/src/hashfn.h
index 06ae37e796b..fed464e11cd 100644
--- a/libglusterfs/src/hashfn.h
+++ b/libglusterfs/src/hashfn.h
@@ -11,11 +11,6 @@
 #ifndef __HASHFN_H__
 #define __HASHFN_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/types.h>
 #include <stdint.h>
 
diff --git a/libglusterfs/src/iatt.h b/libglusterfs/src/iatt.h
index a404d9c8cd0..e89f94662aa 100644
--- a/libglusterfs/src/iatt.h
+++ b/libglusterfs/src/iatt.h
@@ -12,11 +12,6 @@
 #ifndef _IATT_H
 #define _IATT_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h> /* for iatt <--> stat conversions */
 #include <unistd.h>
diff --git a/libglusterfs/src/inode.c b/libglusterfs/src/inode.c
index c010db2a682..47096de5410 100644
--- a/libglusterfs/src/inode.c
+++ b/libglusterfs/src/inode.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "inode.h"
 #include "fd.h"
 #include "common-utils.h"
diff --git a/libglusterfs/src/inode.h b/libglusterfs/src/inode.h
index 50815599347..83646ebda5a 100644
--- a/libglusterfs/src/inode.h
+++ b/libglusterfs/src/inode.h
@@ -11,11 +11,6 @@
 #ifndef _INODE_H
 #define _INODE_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 #include <sys/types.h>
 
diff --git a/libglusterfs/src/lkowner.h b/libglusterfs/src/lkowner.h
index 969d13e5044..78f54a628d1 100644
--- a/libglusterfs/src/lkowner.h
+++ b/libglusterfs/src/lkowner.h
@@ -11,11 +11,6 @@
 #ifndef _LK_OWNER_H
 #define _LK_OWNER_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #define GF_MAX_LOCK_OWNER_LEN 1024 /* 1kB as per NLM */
 
 /* 16strings-16strings-... */
diff --git a/libglusterfs/src/locking.h b/libglusterfs/src/locking.h
index 79c6992af0b..a66cdc188db 100644
--- a/libglusterfs/src/locking.h
+++ b/libglusterfs/src/locking.h
@@ -11,11 +11,6 @@
 #ifndef _LOCKING_H
 #define _LOCKING_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <pthread.h>
 
 #if HAVE_SPINLOCK
diff --git a/libglusterfs/src/logging.c b/libglusterfs/src/logging.c
index e8fca2db916..90eebee2ab5 100644
--- a/libglusterfs/src/logging.c
+++ b/libglusterfs/src/logging.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <errno.h>
 #include <pthread.h>
 #include <stdio.h>
diff --git a/libglusterfs/src/logging.h b/libglusterfs/src/logging.h
index f19fe9e1002..515b4372e8a 100644
--- a/libglusterfs/src/logging.h
+++ b/libglusterfs/src/logging.h
@@ -11,11 +11,6 @@
 #ifndef __LOGGING_H__
 #define __LOGGING_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/time.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/libglusterfs/src/lvm-defaults.h b/libglusterfs/src/lvm-defaults.h
index 4d3b010b200..32feebf3f6e 100644
--- a/libglusterfs/src/lvm-defaults.h
+++ b/libglusterfs/src/lvm-defaults.h
@@ -11,11 +11,6 @@
 #ifndef _LVM_DEFAULTS_H
 #define _LVM_DEFAULTS_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #define LVM_RESIZE "/sbin/lvresize"
 #define LVM_CREATE "/sbin/lvcreate"
 #define LVM_CONVERT "/sbin/lvconvert"
diff --git a/libglusterfs/src/options.c b/libglusterfs/src/options.c
index 75dce0ea3b6..33d81879917 100644
--- a/libglusterfs/src/options.c
+++ b/libglusterfs/src/options.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <fnmatch.h>
 
 #include "xlator.h"
diff --git a/libglusterfs/src/options.h b/libglusterfs/src/options.h
index 05a3d4332cf..83b545850c8 100644
--- a/libglusterfs/src/options.h
+++ b/libglusterfs/src/options.h
@@ -11,11 +11,6 @@
 #ifndef _OPTIONS_H
 #define _OPTIONS_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>
diff --git a/libglusterfs/src/stack.h b/libglusterfs/src/stack.h
index f2d2ef95032..e0cc45eeb60 100644
--- a/libglusterfs/src/stack.h
+++ b/libglusterfs/src/stack.h
@@ -16,11 +16,6 @@
 #ifndef _STACK_H
 #define _STACK_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 struct _call_stack_t;
 typedef struct _call_stack_t call_stack_t;
 struct _call_frame_t;
diff --git a/libglusterfs/src/store.c b/libglusterfs/src/store.c
index 351741f4297..42d2d75d8aa 100644
--- a/libglusterfs/src/store.c
+++ b/libglusterfs/src/store.c
@@ -8,11 +8,6 @@
    cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <inttypes.h>
 #include <libgen.h>
 
diff --git a/libglusterfs/src/store.h b/libglusterfs/src/store.h
index 6b7c98a3547..4a726c6f00b 100644
--- a/libglusterfs/src/store.h
+++ b/libglusterfs/src/store.h
@@ -10,11 +10,6 @@
 #ifndef _GLUSTERD_STORE_H_
 #define _GLUSTERD_STORE_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "compat.h"
 #include "glusterfs.h"
 
diff --git a/libglusterfs/src/strfd.c b/libglusterfs/src/strfd.c
index 3eda05c2dbc..002d48629bc 100644
--- a/libglusterfs/src/strfd.c
+++ b/libglusterfs/src/strfd.c
@@ -8,11 +8,6 @@
    cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdarg.h>
 
 #include "mem-types.h"
diff --git a/libglusterfs/src/syncop-utils.c b/libglusterfs/src/syncop-utils.c
index 349fa92d64f..81393136abb 100644
--- a/libglusterfs/src/syncop-utils.c
+++ b/libglusterfs/src/syncop-utils.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "syncop.h"
 #include "common-utils.h"
 
diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c
index 81eae5a9105..a4e39702b70 100644
--- a/libglusterfs/src/syncop.c
+++ b/libglusterfs/src/syncop.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "syncop.h"
 
 int
diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/syncop.h
index f41706a9d37..7779fada109 100644
--- a/libglusterfs/src/syncop.h
+++ b/libglusterfs/src/syncop.h
@@ -11,11 +11,6 @@
 #ifndef _SYNCOP_H
 #define _SYNCOP_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include <sys/time.h>
 #include <pthread.h>
diff --git a/libglusterfs/src/syscall.c b/libglusterfs/src/syscall.c
index 0828b8a64fa..dc257f6cfcc 100644
--- a/libglusterfs/src/syscall.c
+++ b/libglusterfs/src/syscall.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "compat.h"
 #include "syscall.h"
 
diff --git a/libglusterfs/src/template-component-messages.h b/libglusterfs/src/template-component-messages.h
index c1ea38cf770..7a6d0d14e17 100644
--- a/libglusterfs/src/template-component-messages.h
+++ b/libglusterfs/src/template-component-messages.h
@@ -11,11 +11,6 @@
 #ifndef _component_MESSAGES_H_
 #define _component_MESSAGES_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glfs-message-id.h"
 
 /* NOTE: Rules for message additions
diff --git a/libglusterfs/src/timer.c b/libglusterfs/src/timer.c
index 0d845cdeb38..1aa2079f097 100644
--- a/libglusterfs/src/timer.c
+++ b/libglusterfs/src/timer.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "timer.h"
 #include "logging.h"
 #include "common-utils.h"
diff --git a/libglusterfs/src/timer.h b/libglusterfs/src/timer.h
index e64b350ec58..220a280c705 100644
--- a/libglusterfs/src/timer.h
+++ b/libglusterfs/src/timer.h
@@ -11,11 +11,6 @@
 #ifndef _TIMER_H
 #define _TIMER_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glusterfs.h"
 #include "xlator.h"
 #include <sys/time.h>
diff --git a/libglusterfs/src/trie.h b/libglusterfs/src/trie.h
index 0356e66210e..f7a4deee02f 100644
--- a/libglusterfs/src/trie.h
+++ b/libglusterfs/src/trie.h
@@ -11,11 +11,6 @@
 #ifndef _TRIE_H_
 #define _TRIE_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 struct trienode;
 typedef struct trienode trienode_t;
 
diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c
index 628f3499956..117454092cb 100644
--- a/libglusterfs/src/xlator.c
+++ b/libglusterfs/src/xlator.c
@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include <dlfcn.h>
 #include <netdb.h>
diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/xlator.h
index ca30f99650e..d7dbfb413be 100644
--- a/libglusterfs/src/xlator.h
+++ b/libglusterfs/src/xlator.h
@@ -11,11 +11,6 @@
 #ifndef _XLATOR_H
 #define _XLATOR_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>
-- 
cgit