ctdb-daemon: Remove dependency on includes.h

Instead of includes.h, include the required header files explicitly.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index ff156c9ab53d5d907a1f3054f5d812d46b65f730..73c2e65ecdcdf3fbb5837d14657d1e5c056d9b1a 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -18,16 +18,27 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "lib/tdb_wrap/tdb_wrap.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/locale.h"
-#include <stdlib.h>
-#include "../include/ctdb_private.h"
+
+#include <talloc.h>
+/* Allow use of deprecated function tevent_loop_allow_nesting() */
+#define TEVENT_DEPRECATED
+#include <tevent.h>
+#include <tdb.h>
+
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
+#include "lib/util/time.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+
 #include "common/reqid.h"
 #include "common/system.h"
 

diff --git a/ctdb/common/cmdline.c b/ctdb/common/cmdline.c
index e6910116fef1a0a8a694b3150f2b2e4483bb7ddd..fa7221d571e03b03a65c39c84a75395566093f7a 100644 (file)
--- a/ctdb/common/cmdline.c
+++ b/ctdb/common/cmdline.c
@@ -17,16 +17,25 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "../include/ctdb_client.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
+#include "system/network.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
 #include <ctype.h>
 
+#include "lib/util/debug.h"
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+
+#include "common/rb_tree.h"
 #include "common/cmdline.h"
 
+
+
 /* Handle common command line options for ctdb test progs
  */
 

diff --git a/ctdb/common/ctdb_fork.c b/ctdb/common/ctdb_fork.c
index 336bc8ee1342ee0c69d7e435e0db6d41ae65060b..c6673eb8661510e40c97e08681e852245ef523b6 100644 (file)
--- a/ctdb/common/ctdb_fork.c
+++ b/ctdb/common/ctdb_fork.c
@@ -17,11 +17,20 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/wait.h"
-#include "../include/ctdb_client.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
+#include "system/network.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+
+#include "common/rb_tree.h"
 #include "common/system.h"
 
 void ctdb_set_child_info(TALLOC_CTX *mem_ctx, const char *child_name_fmt, ...)

diff --git a/ctdb/common/ctdb_io.c b/ctdb/common/ctdb_io.c
index a99c56e907997cc805018714b6bf78406c626192..46199b8c015f1f13217b3fa5bee1191357783092 100644 (file)
--- a/ctdb/common/ctdb_io.c
+++ b/ctdb/common/ctdb_io.c
@@ -20,14 +20,20 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "../include/ctdb_private.h"
-#include "../include/ctdb_client.h"
-#include <stdarg.h>
+
+#include <tdb.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+#include "ctdb_client.h"
 
 #include "common/system.h"
 

diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index f4d571ec96636f11f659bc7716843ad55c0024c6..4e7fcafb54f2184da0a8e6296d0893c3a424b788 100644 (file)
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -18,13 +18,18 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "../include/ctdb_private.h"
+
+#include <tdb.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
 
 /*
   find an attached ctdb_db handle given a name

diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index 474ebfa9fafc1b0ccc4f35e8fb41d4fdfb2881f5..d158143f920ad4414edd9815aadb4b34cd545823 100644 (file)
--- a/ctdb/common/ctdb_util.c
+++ b/ctdb/common/ctdb_util.c
@@ -17,12 +17,19 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
+
+#include <tdb.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+
 #include "common/reqid.h"
 #include "common/system.h"
 

diff --git a/ctdb/common/rb_tree.c b/ctdb/common/rb_tree.c
index 6b131bc0932b66afd622bf5c70a476d8deac4faf..4b1ff97199e276eecc9565eff5f2c42e50aa7526 100644 (file)
--- a/ctdb/common/rb_tree.c
+++ b/ctdb/common/rb_tree.c
@@ -17,7 +17,13 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+
+#include <talloc.h>
+
+#include "lib/util/debug.h"
+#include "ctdb_logging.h"
+
 #include "rb_tree.h"
 
 #define NO_MEMORY_FATAL(p) do { if (!(p)) { \

diff --git a/ctdb/common/system_aix.c b/ctdb/common/system_aix.c
index 59ee87185f609e4bd9df394a7191c4c8cfd928bc..e2b6536962d565aff4ade9b23912862cde945b2f 100644 (file)
--- a/ctdb/common/system_aix.c
+++ b/ctdb/common/system_aix.c
@@ -19,11 +19,16 @@
 */
 
 
-#include "includes.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
+
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+
 #include <netinet/if_ether.h>
 #include <netinet/ip6.h>
 #include <net/if_arp.h>

diff --git a/ctdb/common/system_common.c b/ctdb/common/system_common.c
index 1e0a095ec8c4b40426c79e79994fd0901387c097..9b12236be089b3042eec990cc3b5f7d6d7b5902e 100644 (file)
--- a/ctdb/common/system_common.c
+++ b/ctdb/common/system_common.c
@@ -18,9 +18,12 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/network.h"
 
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include "common/system.h"

diff --git a/ctdb/common/system_freebsd.c b/ctdb/common/system_freebsd.c
index e132e5ce4932e5f19e0af4f2c041958e992d646d..320941f7ee28161f03c31e4571fca1dc4006d127 100644 (file)
--- a/ctdb/common/system_freebsd.c
+++ b/ctdb/common/system_freebsd.c
@@ -24,11 +24,16 @@
   needs, and inspired by 'common/system_aix.c' for the pcap usage.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
+
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+
 #include <net/ethernet.h>
 #include <netinet/ip6.h>
 #include <net/if_arp.h>

diff --git a/ctdb/common/system_gnu.c b/ctdb/common/system_gnu.c
index 7921655b5c7160f835fc9d6ef6796a084b332f04..f38e622b3c85dd2f3af5cd8e0f6eeb8653df5d35 100644 (file)
--- a/ctdb/common/system_gnu.c
+++ b/ctdb/common/system_gnu.c
@@ -23,11 +23,16 @@
   and inspired by 'common/system_aix.c' for the pcap usage.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
+
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+
 #include <net/ethernet.h>
 #include <netinet/ip6.h>
 #include <net/if_arp.h>

diff --git a/ctdb/common/system_kfreebsd.c b/ctdb/common/system_kfreebsd.c
index dd7f71a6af27e781bade2b2742db711c3f2cf292..f4ecc289b221175c0238020a74ff9394e6e733f9 100644 (file)
--- a/ctdb/common/system_kfreebsd.c
+++ b/ctdb/common/system_kfreebsd.c
@@ -23,11 +23,16 @@
   needs, and inspired by 'common/system_aix.c' for the pcap usage.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
+
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+
 #include <net/ethernet.h>
 #include <netinet/ip6.h>
 #include <net/if_arp.h>

diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c
index bca928dc2f219af158770301fc22f23799f1c0d0..d8a6e68462c13d272123cb7e9b1d5da46bf74238 100644 (file)
--- a/ctdb/common/system_linux.c
+++ b/ctdb/common/system_linux.c
@@ -18,11 +18,16 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
+
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+
 #include <netinet/if_ether.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>

diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c
index 088d86b449c05c989bad4b41586ef60a8f8fe9b6..91e2621e39c6d7632ed102bf03353ad2c16e52ba 100644 (file)
--- a/ctdb/common/system_util.c
+++ b/ctdb/common/system_util.c
@@ -18,12 +18,16 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
 #include "system/shmem.h"
+#include "system/network.h"
 
 #include <libgen.h>
 
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include "common/system.h"

diff --git a/ctdb/ib/ibw_ctdb.c b/ctdb/ib/ibw_ctdb.c
index 96b126c4eaa3a07355ff8f6fc14be87c20fdafae..35d0514b6821d95610bbcf43068266a48d65e767 100644 (file)
--- a/ctdb/ib/ibw_ctdb.c
+++ b/ctdb/ib/ibw_ctdb.c
@@ -20,10 +20,19 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "includes.h"
-#include <system/network.h>
+#include "replace.h"
+#include "system/network.h"
+
 #include <assert.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/time.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
 #include "ctdb_private.h"
+
 #include "ibwrapper.h"
 #include "ibw_ctdb.h"
 

diff --git a/ctdb/ib/ibw_ctdb_init.c b/ctdb/ib/ibw_ctdb_init.c
index b71909ad0f82fcb5f913b3b40f513666d00abb9a..ec4d933b3da2629f1303e457f5991fd2c5a5c607 100644 (file)
--- a/ctdb/ib/ibw_ctdb_init.c
+++ b/ctdb/ib/ibw_ctdb_init.c
@@ -20,13 +20,21 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "includes.h"
-#include <system/network.h>
+#include "replace.h"
+#include "system/network.h"
+
 #include <assert.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
 #include "ctdb_private.h"
+
 #include "ibwrapper.h"
 #include "ibw_ctdb.h"
-#include "lib/util/dlinklist.h"
 
 static int ctdb_ibw_listen(struct ctdb_context *ctdb, int backlog)
 {

diff --git a/ctdb/ib/ibwrapper.c b/ctdb/ib/ibwrapper.c
index 523cfacf40181b7ff54cf45da76ca6afab92a381..ad97fda4aa8bb3e520b875cc639e696e1d61e851 100644 (file)
--- a/ctdb/ib/ibwrapper.c
+++ b/ctdb/ib/ibwrapper.c
@@ -20,28 +20,24 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <malloc.h>
+#include "replace.h"
+#include "system/network.h"
+
 #include <assert.h>
-#include <unistd.h>
+#include <talloc.h>
+#include <tevent.h>
 
-#include "includes.h"
-#include "ibwrapper.h"
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
 
 #include <infiniband/kern-abi.h>
 #include <rdma/rdma_cma_abi.h>
 #include <rdma/rdma_cma.h>
 
+#include "ibwrapper.h"
 #include "ibwrapper_internal.h"
-#include "lib/util/dlinklist.h"
 
 #define IBW_LASTERR_BUFSIZE 512
 static char ibw_lasterr[IBW_LASTERR_BUFSIZE];

diff --git a/ctdb/ib/ibwrapper_test.c b/ctdb/ib/ibwrapper_test.c
index f8cf99604a7f6c407ecfc57eac1b82dc498047b6..537df915eaa35867c8952b86fda568f569fa00bf 100644 (file)
--- a/ctdb/ib/ibwrapper_test.c
+++ b/ctdb/ib/ibwrapper_test.c
@@ -20,23 +20,19 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <malloc.h>
+#include "replace.h"
+#include "system/network.h"
+#include "system/time.h"
+
 #include <assert.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <time.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/time.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
 
-#include "includes.h"
 #include "ib/ibwrapper.h"
 
 struct ibwtest_ctx {

diff --git a/ctdb/server/ctdb_banning.c b/ctdb/server/ctdb_banning.c
index 0623ec4636d58e1fab33be29cdda97ccef7cb532..8bc87257d4703025e4366aae695304583d7fee49 100644 (file)
--- a/ctdb/server/ctdb_banning.c
+++ b/ctdb/server/ctdb_banning.c
@@ -16,14 +16,21 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/time.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "../include/ctdb_client.h"
-#include "../include/ctdb_private.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
 
 
 static void ctdb_ban_node_event(struct tevent_context *ev,

diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index a919e18948ecaaf57350b77654d0f9af701578a4..80716cdae05763e289f93c0ad0efc04f9683f235 100644 (file)
--- a/ctdb/server/ctdb_call.c
+++ b/ctdb/server/ctdb_call.c
@@ -20,13 +20,22 @@
   see http://wiki.samba.org/index.php/Samba_%26_Clustering for
   protocol design and packet details
 */
-#include "includes.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
+#include "common/rb_tree.h"
 #include "common/reqid.h"
 #include "common/system.h"
 

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index eeb810f96ec387a1e61c55f4499ff5807b54080e..5e4516cbb37c8f80f92c6b0c29bde27b016b2ad5 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -16,15 +16,24 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
-#include "lib/util/dlinklist.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
 #include "lib/util/talloc_report.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
 #include "common/reqid.h"
 
 

diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index d8c2280a426828d1f482fbcebbbf5a2b3ffc004d..3598c580ac4039a8bbe9f16b0e292700c11b24e3 100644 (file)
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -17,18 +17,29 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "lib/tdb_wrap/tdb_wrap.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
+#include "system/time.h"
+
+#include <talloc.h>
+/* Allow use of deprecated function tevent_loop_allow_nesting() */
+#define TEVENT_DEPRECATED
+#include <tevent.h>
+#include <tdb.h>
+
+#include "lib/tdb_wrap/tdb_wrap.h"
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
 #include "../include/ctdb_version.h"
-#include "../include/ctdb_client.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
-#include <sys/socket.h>
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
+#include "common/rb_tree.h"
 #include "common/reqid.h"
 #include "common/system.h"
 

diff --git a/ctdb/server/ctdb_event_helper.c b/ctdb/server/ctdb_event_helper.c
index 7d24820d6df41814742bb3e7201490dcfd61c193..8db02b9100990ce5a76e8e86e1b9b29a1a7c9c7b 100644 (file)
--- a/ctdb/server/ctdb_event_helper.c
+++ b/ctdb/server/ctdb_event_helper.c
@@ -17,9 +17,15 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
+#include "system/network.h"
+#include "system/wait.h"
+
+#include <talloc.h>
+
 #include "ctdb_private.h"
+
 #include "common/system.h"
 
 static char *progname = NULL;

diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c
index 5a688d3d7a302259c86c9793ffa55316086af2be..9d370648a0079fe76a93846e78306588127abe42 100644 (file)
--- a/ctdb/server/ctdb_freeze.c
+++ b/ctdb/server/ctdb_freeze.c
@@ -16,15 +16,22 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
-#include "lib/util/dlinklist.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
-#include "../common/rb_tree.h"
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_private.h"
+#include "ctdb_logging.h"
+
+#include "common/rb_tree.h"
 
 
 /**

diff --git a/ctdb/server/ctdb_keepalive.c b/ctdb/server/ctdb_keepalive.c
index c286618c0a3b7b76228079c3a0b463544f5cf785..6873d75f50a18c2e7f19682e37628fef35c887d0 100644 (file)
--- a/ctdb/server/ctdb_keepalive.c
+++ b/ctdb/server/ctdb_keepalive.c
@@ -18,10 +18,20 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
+#include "system/network.h"
+#include "system/time.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_logging.h"
 
 
 /*

diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c
index 734327e9ccef82c240faad319ed5bd497afef3a7..cdda7ea85d045d73e0b54eb913848fb93569d8e6 100644 (file)
--- a/ctdb/server/ctdb_lock.c
+++ b/ctdb/server/ctdb_lock.c
@@ -17,14 +17,22 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "includes.h"
-#include "include/ctdb_private.h"
-#include "include/ctdb_protocol.h"
-#include "tevent.h"
-#include "tdb.h"
-#include "lib/tdb_wrap/tdb_wrap.h"
+#include "replace.h"
 #include "system/filesys.h"
+#include "system/network.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_protocol.h"
+#include "ctdb_logging.h"
+
 #include "common/system.h"
 
 /*

diff --git a/ctdb/server/ctdb_lock_helper.c b/ctdb/server/ctdb_lock_helper.c
index c48a925bd955640a7f44fdc94eeb5c936f5aa374..543c5d0eb7d65a5793f7ff796c75f39385bb55e1 100644 (file)
--- a/ctdb/server/ctdb_lock_helper.c
+++ b/ctdb/server/ctdb_lock_helper.c
@@ -17,10 +17,14 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/filesys.h"
+#include "system/network.h"
+
+#include <talloc.h>
+
 #include "ctdb_private.h"
+
 #include "common/system.h"
 
 static char *progname = NULL;

diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c
index 7eefe232599765d050cee37704ef13e5fbdb52a6..d4545a9d4c693eabaf16525d838b51f8db914c9d 100644 (file)
--- a/ctdb/server/ctdb_logging.c
+++ b/ctdb/server/ctdb_logging.c
@@ -17,14 +17,22 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "../include/ctdb_client.h"
-#include "../include/ctdb_private.h"
+#include "replace.h"
+#include "system/filesys.h"
+#include "system/network.h"
 #include "system/syslog.h"
 #include "system/time.h"
-#include "system/filesys.h"
-#include "lib/util/debug.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
 #include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
 #include "common/system.h"
 
 struct ctdb_log_backend {

diff --git a/ctdb/server/ctdb_logging_file.c b/ctdb/server/ctdb_logging_file.c
index 24a4167f6ea018036756cdb4d80ad09c5b0d2903..e1586e1e2429609acc4a039741ffbed8f1f9c678 100644 (file)
--- a/ctdb/server/ctdb_logging_file.c
+++ b/ctdb/server/ctdb_logging_file.c
@@ -17,12 +17,20 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "../include/ctdb_client.h"
-#include "../include/ctdb_private.h"
+#include "replace.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "system/network.h"
+
+#include <talloc.h>
+
+#include "lib/util/debug.h"
 #include "lib/util/time_basic.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
 #include "common/system.h"
 
 #define CTDB_LOG_FILE_PREFIX "file"

diff --git a/ctdb/server/ctdb_logging_syslog.c b/ctdb/server/ctdb_logging_syslog.c
index f651207bb4cb856d303a7f9258d94b73f980c996..c1ba1f4f0961b25b9fab96fe9b21eb20b10c6ba7 100644 (file)
--- a/ctdb/server/ctdb_logging_syslog.c
+++ b/ctdb/server/ctdb_logging_syslog.c
@@ -21,10 +21,13 @@
 #include "replace.h"
 #include "system/network.h"
 #include "system/syslog.h"
+
 #include "lib/util/debug.h"
 #include "lib/util/blocking.h"
 #include "lib/util/time_basic.h"
 #include "lib/util/samba_util.h" /* get_myname */
+
+#include "ctdb_private.h"
 #include "ctdb_logging.h"
 
 /* Linux and FreeBSD define this appropriately - try good old /dev/log

diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index becf80f8b1b87bfc2a0923cf128222b85b3c989d..1affada5f0ff1c5fa7e2b637bfb3088fe789b013 100644 (file)
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -17,17 +17,26 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/dir.h"
 #include "system/time.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
+#include "system/locale.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
-#include <ctype.h>
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
+#include "common/rb_tree.h"
 #include "common/reqid.h"
 #include "common/system.h"
 

diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c
index 44c3a7db89ea23d5859b1483fdf2cbed81755c8e..4f861e82e2c312b3e90b12164e5db9453f9a2d89 100644 (file)
--- a/ctdb/server/ctdb_monitor.c
+++ b/ctdb/server/ctdb_monitor.c
@@ -18,10 +18,20 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
+#include "system/network.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_logging.h"
+
 #include "common/system.h"
 
 struct ctdb_monitor_state {

diff --git a/ctdb/server/ctdb_persistent.c b/ctdb/server/ctdb_persistent.c
index 20397452ef73c532bc0dac5fd7b60fb4167cf0f6..aa878044d33cd50b20354f6c465426f72f30884a 100644 (file)
--- a/ctdb/server/ctdb_persistent.c
+++ b/ctdb/server/ctdb_persistent.c
@@ -18,12 +18,22 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
+#include "system/network.h"
+#include "system/time.h"
 #include "system/wait.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
-#include "tdb.h"
-#include "../include/ctdb_private.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_logging.h"
+
 #include "common/reqid.h"
 
 struct ctdb_persistent_state {

diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index 9738fa8819208887af48879a9dc0b812e225741d..23226d3bf0820f3399360caffc5658161e27cb21 100644 (file)
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -17,15 +17,25 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/time.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
-#include "lib/util/dlinklist.h"
+
+#include <talloc.h>
+#include <tevent.h>
+#include <tdb.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
 #include "common/system.h"
 
 int 

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 5532db67216bdb841678008bc828b8b6c9de4a22..8eaed2b7bed03eed9d3306b64fd74ee3603ac3b2 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -17,18 +17,28 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
 #include "system/time.h"
 #include "system/network.h"
 #include "system/wait.h"
-#include "popt.h"
-#include "common/cmdline.h"
-#include "../include/ctdb_client.h"
-#include "../include/ctdb_private.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+#include <tdb.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
 #include "common/system.h"
+#include "common/cmdline.h"
 
 
 /* List of SRVID requests that need to be processed */

diff --git a/ctdb/server/ctdb_server.c b/ctdb/server/ctdb_server.c
index 2f4a1d3e0ca3a029372c0bdcf7bade70de3183f9..95ded1426711f67c10b1817385186806673cf574 100644 (file)
--- a/ctdb/server/ctdb_server.c
+++ b/ctdb/server/ctdb_server.c
@@ -17,12 +17,20 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "../include/ctdb_private.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
 
 /*
   choose the transport we will use

diff --git a/ctdb/server/ctdb_serverids.c b/ctdb/server/ctdb_serverids.c
index d264a1f9a359fd7de3a761a81aac2956df4c3283..9186cc5beeef2500dbf4e4d86b6f1cd85cdc1947 100644 (file)
--- a/ctdb/server/ctdb_serverids.c
+++ b/ctdb/server/ctdb_serverids.c
@@ -16,9 +16,17 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "includes.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
+#include "replace.h"
+#include "system/network.h"
+
+#include <talloc.h>
+
+#include "lib/util/debug.h"
+
+#include "ctdb_private.h"
+#include "ctdb_logging.h"
+
+#include "common/rb_tree.h"
 #include "common/reqid.h"
 
 

diff --git a/ctdb/server/ctdb_statistics.c b/ctdb/server/ctdb_statistics.c
index cb245d6080600760b70fc8c8c7b2a3269f6c6634..c96858631b02d40596c1658cd3e77e231fef0676 100644 (file)
--- a/ctdb/server/ctdb_statistics.c
+++ b/ctdb/server/ctdb_statistics.c
@@ -17,9 +17,18 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include <string.h>
-#include "../include/ctdb_private.h"
+#include "replace.h"
+#include "system/network.h"
+#include "system/time.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_logging.h"
 
 static void ctdb_statistics_update(struct tevent_context *ev,
                                   struct tevent_timer *te,

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 4535ee2b0736aa562b0b39136b6558b4dd5fac3f..c806178b50aedcffc77d2523671db7f0bad30176 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -18,14 +18,24 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "includes.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
+#include "system/time.h"
 #include "system/wait.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
+#include "common/rb_tree.h"
 #include "common/reqid.h"
 #include "common/system.h"
 

diff --git a/ctdb/server/ctdb_traverse.c b/ctdb/server/ctdb_traverse.c
index 1f1562b2e3580fb7b50116d86abf446878eb93c3..4cdb3d02dfd69ec72a8a0f02043768b04d3e7499 100644 (file)
--- a/ctdb/server/ctdb_traverse.c
+++ b/ctdb/server/ctdb_traverse.c
@@ -17,13 +17,24 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
+#include "system/network.h"
 #include "system/wait.h"
+#include "system/time.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
-#include "tdb.h"
-#include "../include/ctdb_private.h"
 #include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
 #include "common/reqid.h"
 #include "common/system.h"
 

diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c
index 031e60f49684227941ce418e606a1657bf98eed3..230a315b73ad1e8713f052052305d750ef83f0ed 100644 (file)
--- a/ctdb/server/ctdb_tunables.c
+++ b/ctdb/server/ctdb_tunables.c
@@ -16,8 +16,16 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
-#include "includes.h"
-#include "../include/ctdb_private.h"
+#include "replace.h"
+#include "system/network.h"
+
+#include <talloc.h>
+#include <tdb.h>
+
+#include "lib/util/debug.h"
+
+#include "ctdb_private.h"
+#include "ctdb_logging.h"
 
 static const struct {
        const char *name;

diff --git a/ctdb/server/ctdb_update_record.c b/ctdb/server/ctdb_update_record.c
index 398cdbaa350178a441f22e4992ee8efb701343d7..1c3fef2a07139c3be349e217e223a770abaab7de 100644 (file)
--- a/ctdb/server/ctdb_update_record.c
+++ b/ctdb/server/ctdb_update_record.c
@@ -18,10 +18,21 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "system/network.h"
+#include "system/time.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
-#include "tdb.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
 #include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
 #include "common/system.h"
 
 struct ctdb_persistent_write_state {

diff --git a/ctdb/server/ctdb_uptime.c b/ctdb/server/ctdb_uptime.c
index b45ea80dd196bdf013edf13456f32e6f49578ba7..7968cdc37d6b1c09a047ab95bd389d9a54610b29 100644 (file)
--- a/ctdb/server/ctdb_uptime.c
+++ b/ctdb/server/ctdb_uptime.c
@@ -17,11 +17,19 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "../include/ctdb_private.h"
+#include "replace.h"
 #include "system/syslog.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "system/network.h"
+
+#include <talloc.h>
+
+#include "lib/util/debug.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
 
 /* 
    returns the ctdb uptime

diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index 49bc7ff7159fa26e13f85dabb8aefd74f92eaafe..3d61befd620de8396f97c660d2ef3039df90c8a5 100644 (file)
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -19,16 +19,24 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "system/dir.h"
-#include "../include/ctdb_private.h"
+#include "system/time.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
+#include "common/rb_tree.h"
 #include "common/system.h"
 
 #define TIMELIMIT() timeval_current_ofs(10, 0)

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index ff6d181f095680523c210de8e43c102c26945c0b..58313844174b8c855b84527b4a282eb222021cce 100644 (file)
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -17,16 +17,27 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
 #include "system/time.h"
 #include "system/wait.h"
 #include "system/network.h"
-#include "common/cmdline.h"
-#include "../include/ctdb_private.h"
+
+#include <popt.h>
+#include <talloc.h>
+/* Allow use of deprecated function tevent_loop_allow_nesting() */
+#define TEVENT_DEPRECATED
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_logging.h"
+
 #include "common/reqid.h"
 #include "common/system.h"
+#include "common/cmdline.h"
 
 static struct {
        const char *nlist;

diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 27ec91f7bb849c4d6e5196b5e4a12e336840f791..2fac047626a42217c5d005d1c50102248585072d 100644 (file)
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -17,17 +17,28 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include <time.h>
+#include "replace.h"
 #include "system/filesys.h"
+#include "system/network.h"
 #include "system/wait.h"
 #include "system/dir.h"
 #include "system/locale.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
+#include "system/time.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
 #include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_logging.h"
+
+#include "common/rb_tree.h"
 #include "common/system.h"
 
+
 static void ctdb_event_script_timeout(struct tevent_context *ev,
                                      struct tevent_timer *te,
                                      struct timeval t, void *p);

diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c
index d79b581ec93322ff79eafe5c75648628badf5959..0b18c968e1ed90212df8d96c228c86923d81cae6 100644 (file)
--- a/ctdb/tcp/tcp_connect.c
+++ b/ctdb/tcp/tcp_connect.c
@@ -18,12 +18,21 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "../include/ctdb_private.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/time.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+
 #include "common/system.h"
+
 #include "ctdb_tcp.h"
 
 /*

diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c
index 9619975887ba1766772c9255e2d38244f639fe41..02f580277ef90b50bd3c1ee4f3674ab9449746d3 100644 (file)
--- a/ctdb/tcp/tcp_init.c
+++ b/ctdb/tcp/tcp_init.c
@@ -17,11 +17,19 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "../include/ctdb_private.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/time.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+
 #include "ctdb_tcp.h"
 
 static int tnode_destructor(struct ctdb_tcp_node *tnode)

diff --git a/ctdb/tcp/tcp_io.c b/ctdb/tcp/tcp_io.c
index a951320a07d4e1a173b7b98176d6d4510328afb6..5be8d85e5334de1621240c111fcbf77b40a64c1f 100644 (file)
--- a/ctdb/tcp/tcp_io.c
+++ b/ctdb/tcp/tcp_io.c
@@ -17,12 +17,16 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "lib/util/dlinklist.h"
-#include "tdb.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "../include/ctdb_private.h"
+
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+
 #include "ctdb_tcp.h"
 
 

diff --git a/ctdb/tests/src/ctdb_bench.c b/ctdb/tests/src/ctdb_bench.c
index bc0a7cc288045ebe1cac7483292923ba4a8bd26a..1b0c30bc6ab9e6ac4b791a54ffc9e5d18d87ff67 100644 (file)
--- a/ctdb/tests/src/ctdb_bench.c
+++ b/ctdb/tests/src/ctdb_bench.c
@@ -17,15 +17,22 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
-#include "ctdb_client.h"
-#include "ctdb_private.h"
+#include "system/network.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/time.h"
+#include "lib/util/debug.h"
 
-#include <sys/time.h>
-#include <time.h>
+#include "common/cmdline.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+#include "ctdb_client.h"
 
 static struct timeval tp1,tp2;
 

diff --git a/ctdb/tests/src/ctdb_fetch.c b/ctdb/tests/src/ctdb_fetch.c
index 5567af3e7649e79020b0cfca0083e7b261176f09..592332b14c0f66e868f4413c79f21cdd8f7803ee 100644 (file)
--- a/ctdb/tests/src/ctdb_fetch.c
+++ b/ctdb/tests/src/ctdb_fetch.c
@@ -17,13 +17,23 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
+#include "system/network.h"
+
+#include <popt.h>
+#include <talloc.h>
+/* Allow use of deprecated function tevent_loop_allow_nesting() */
+#define TEVENT_DEPRECATED
+#include <tevent.h>
+#include <tdb.h>
+
+#include "lib/util/time.h"
+
+#include "ctdb_client.h"
+
+#include "common/cmdline.h"
 
-#include <sys/time.h>
-#include <time.h>
 
 static struct timeval tp1,tp2;
 

diff --git a/ctdb/tests/src/ctdb_fetch_one.c b/ctdb/tests/src/ctdb_fetch_one.c
index b704a6bc27c6b8bdd030fed5be42cc408bc9a035..b92014a383fa45e8e3237ca7fd92ab797c747467 100644 (file)
--- a/ctdb/tests/src/ctdb_fetch_one.c
+++ b/ctdb/tests/src/ctdb_fetch_one.c
@@ -18,13 +18,20 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
+#include "system/network.h"
 
-#include <sys/time.h>
-#include <time.h>
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+#include <tdb.h>
+
+#include "lib/util/time.h"
+
+#include "ctdb_client.h"
+
+#include "common/cmdline.h"
 
 static int timelimit = 10;
 static int lock_count = 0;

diff --git a/ctdb/tests/src/ctdb_fetch_readonly_loop.c b/ctdb/tests/src/ctdb_fetch_readonly_loop.c
index fdd5007fd866d49e36241d04afcd76ceebde90e4..29d7c2dcee6b1bd40c1d26e6abe9b924534e1ac2 100644 (file)
--- a/ctdb/tests/src/ctdb_fetch_readonly_loop.c
+++ b/ctdb/tests/src/ctdb_fetch_readonly_loop.c
@@ -18,12 +18,22 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
+#include "system/network.h"
 #include "system/time.h"
-#include "popt.h"
-#include "cmdline.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+#include <tdb.h>
+
+#include "lib/util/time.h"
+
 #include "ctdb_private.h"
+#include "ctdb_client.h"
+
+#include "common/cmdline.h"
 
 static struct ctdb_db_context *ctdb_db;
 

diff --git a/ctdb/tests/src/ctdb_fetch_readonly_once.c b/ctdb/tests/src/ctdb_fetch_readonly_once.c
index 3b364f340965c78d62463631f7fe2347eee19c04..206f52da7a06418216b853aabd6e591276e5fdeb 100644 (file)
--- a/ctdb/tests/src/ctdb_fetch_readonly_once.c
+++ b/ctdb/tests/src/ctdb_fetch_readonly_once.c
@@ -18,10 +18,18 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include <poll.h>
+#include "system/network.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+#include <tdb.h>
+
+#include "lib/util/time.h"
+
+#include "ctdb_client.h"
 
 const char *TESTKEY = "testkey";
 

diff --git a/ctdb/tests/src/ctdb_lock_tdb.c b/ctdb/tests/src/ctdb_lock_tdb.c
index a53ffa13f9517d5622663006528a3b19611792d4..df313c64abb83d635cd80f246e11740fa074be0f 100644 (file)
--- a/ctdb/tests/src/ctdb_lock_tdb.c
+++ b/ctdb/tests/src/ctdb_lock_tdb.c
@@ -1,7 +1,7 @@
-#include <stdio.h>
-#include <fcntl.h>
+#include "replace.h"
+#include "system/filesys.h"
 
-#include "includes.h"
+#include <tdb.h>
 
 const char *tdb_file;
 TDB_CONTEXT *tdb;

diff --git a/ctdb/tests/src/ctdb_persistent.c b/ctdb/tests/src/ctdb_persistent.c
index 99bd54c1a52226a90e158a6bbfff1cead6739e29..ac3e15d457e7610fd14ed41b9feb983cd0ef485d 100644 (file)
--- a/ctdb/tests/src/ctdb_persistent.c
+++ b/ctdb/tests/src/ctdb_persistent.c
@@ -18,13 +18,22 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
+#include "system/network.h"
 
-#include <sys/time.h>
-#include <time.h>
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+#include <tdb.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/time.h"
+
+#include "common/cmdline.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_client.h"
 
 static struct timeval tp1,tp2;
 

diff --git a/ctdb/tests/src/ctdb_porting_tests.c b/ctdb/tests/src/ctdb_porting_tests.c
index c8e268f58a1f43bd9e2fe6cd95c410ef2a6d94ef..8718faaa7df4a9327521fb8b1ee6660cc5fdc2bf 100644 (file)
--- a/ctdb/tests/src/ctdb_porting_tests.c
+++ b/ctdb/tests/src/ctdb_porting_tests.c
@@ -17,13 +17,24 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "include/ctdb_private.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
+#include "system/network.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+#include <tdb.h>
+
+#include "lib/util/debug.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_client.h"
+
+#include "common/cmdline.h"
 #include "common/system.h"
 
+
 static struct {
        const char *socketname;
        const char *debuglevel;

diff --git a/ctdb/tests/src/ctdb_randrec.c b/ctdb/tests/src/ctdb_randrec.c
index 0813295e0841f784a966138fb8290975c7f4fec8..c861d318d31f2fc6a0dc96bca3bf0ac87a03cd12 100644 (file)
--- a/ctdb/tests/src/ctdb_randrec.c
+++ b/ctdb/tests/src/ctdb_randrec.c
@@ -18,14 +18,23 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
-#include "ctdb_private.h"
+#include "system/network.h"
+#include "system/time.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/time.h"
 
-#include <sys/time.h>
-#include <time.h>
+#include "common/cmdline.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+#include "ctdb_client.h"
 
 static struct timeval tp1,tp2;
 

diff --git a/ctdb/tests/src/ctdb_store.c b/ctdb/tests/src/ctdb_store.c
index b0a7abb75e63cd787ad6e80aedd083e9845aaf81..756c98db3ec8b5942e5fe059dd0cf064a8186f19 100644 (file)
--- a/ctdb/tests/src/ctdb_store.c
+++ b/ctdb/tests/src/ctdb_store.c
@@ -18,13 +18,20 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
+#include "system/network.h"
 
-#include <sys/time.h>
-#include <time.h>
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+#include <tdb.h>
+
+#include "lib/util/time.h"
+
+#include "common/cmdline.h"
+
+#include "ctdb_client.h"
 
 static int num_records = 10;
 static int base_rec;

diff --git a/ctdb/tests/src/ctdb_trackingdb_test.c b/ctdb/tests/src/ctdb_trackingdb_test.c
index 1d0cf8b5ca4988ecff84942c2c14abb951d44641..a3764e35ab1f377dbde90fbcf77d0973f8d57905 100644 (file)
--- a/ctdb/tests/src/ctdb_trackingdb_test.c
+++ b/ctdb/tests/src/ctdb_trackingdb_test.c
@@ -22,13 +22,21 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
+#include "system/network.h"
 #include "system/time.h"
-#include "popt.h"
-#include "cmdline.h"
-#include "ctdb_private.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
+#include "lib/util/time.h"
+
+#include "common/cmdline.h"
+
+#include "ctdb_private.h"
 
 #define MAXINDEX 64
 char indices[MAXINDEX];

diff --git a/ctdb/tests/src/ctdb_transaction.c b/ctdb/tests/src/ctdb_transaction.c
index 53d0e3d812e46c2b6bc0635572dda35dcf5f421d..50ff6ce20b3e6a6c3cdbf25072a6f1819ac1a4a3 100644 (file)
--- a/ctdb/tests/src/ctdb_transaction.c
+++ b/ctdb/tests/src/ctdb_transaction.c
@@ -19,13 +19,21 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
+#include "system/network.h"
 
-#include <sys/time.h>
-#include <time.h>
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/time.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_client.h"
+
+#include "common/cmdline.h"
 
 static struct timeval tp1,tp2;
 

diff --git a/ctdb/tests/src/ctdb_traverse.c b/ctdb/tests/src/ctdb_traverse.c
index 37556dfc09399d32f9c56a34272785326a234df6..7dc347e59c48cc3a345c7f10037441676aa6b1c7 100644 (file)
--- a/ctdb/tests/src/ctdb_traverse.c
+++ b/ctdb/tests/src/ctdb_traverse.c
@@ -18,13 +18,20 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
+#include "system/network.h"
 
-#include <sys/time.h>
-#include <time.h>
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+#include <tdb.h>
+
+#include "lib/util/time.h"
+
+#include "common/cmdline.h"
+
+#include "ctdb_client.h"
 
 static const char *dbname = "test.tdb";
 

diff --git a/ctdb/tests/src/ctdb_update_record.c b/ctdb/tests/src/ctdb_update_record.c
index f582c4c27e4eff6fd4ff82beffd377624dd521b0..971afc73bd9cd37a2005f214ef90726a0bfd61ab 100644 (file)
--- a/ctdb/tests/src/ctdb_update_record.c
+++ b/ctdb/tests/src/ctdb_update_record.c
@@ -18,11 +18,20 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
+#include "system/network.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/time.h"
+
 #include "ctdb_private.h"
+#include "ctdb_client.h"
+
+#include "common/cmdline.h"
 
 static struct ctdb_db_context *ctdb_db;
 

diff --git a/ctdb/tests/src/ctdb_update_record_persistent.c b/ctdb/tests/src/ctdb_update_record_persistent.c
index 4781895bc71604daab0cba4b5e7ca6ee58b05a21..ca138914fd7143907ee0d74bae902f813a30c03a 100644 (file)
--- a/ctdb/tests/src/ctdb_update_record_persistent.c
+++ b/ctdb/tests/src/ctdb_update_record_persistent.c
@@ -18,12 +18,21 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "lib/tdb_wrap/tdb_wrap.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
+#include "system/network.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/tdb_wrap/tdb_wrap.h"
+#include "lib/util/time.h"
+
 #include "ctdb_private.h"
+#include "ctdb_client.h"
+
+#include "common/cmdline.h"
 
 
 static void update_once(struct ctdb_context *ctdb, struct tevent_context *ev,

diff --git a/ctdb/tests/src/ctdbd_test.c b/ctdb/tests/src/ctdbd_test.c
index 6a81cbd63ab4115c42c4c01f954b2c1effb05a81..c2155f5fd708cfdf86da45dd82d05209f5e2093d 100644 (file)
--- a/ctdb/tests/src/ctdbd_test.c
+++ b/ctdb/tests/src/ctdbd_test.c
@@ -20,8 +20,14 @@
 #ifndef _CTDBD_TEST_C
 #define _CTDBD_TEST_C
 
-#include "includes.h"
-#include "tdb.h"
+#include "replace.h"
+#include "system/network.h"
+
+#include <talloc.h>
+/* Allow use of deprecated function tevent_loop_allow_nesting() */
+#define TEVENT_DEPRECATED
+#include <tevent.h>
+
 #include "ctdb_private.h"
 
 /*

diff --git a/ctdb/tests/src/rb_test.c b/ctdb/tests/src/rb_test.c
index 44842e68a2f1e318733037ca0f8bf4bd68333345..283a3141abfe507d7a884935fbdf9bf179981b18 100644 (file)
--- a/ctdb/tests/src/rb_test.c
+++ b/ctdb/tests/src/rb_test.c
@@ -17,14 +17,17 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "lib/util/dlinklist.h"
+#include "replace.h"
 #include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
+#include "system/time.h"
+
+#include <popt.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/dlinklist.h"
 
-#include <sys/time.h>
-#include <time.h>
+#include "common/cmdline.h"
 #include "common/rb_tree.h"
 
 static struct timeval tp1,tp2;

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 0447878dc36e504a3b525f787991570f353f21dc..4c6f8226713961f18f7f44b433a004361e10b69a 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -18,19 +18,32 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "system/network.h"
 #include "system/locale.h"
-#include "popt.h"
-#include "common/cmdline.h"
-#include "../include/ctdb_version.h"
-#include "../include/ctdb_client.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
+
+#include <popt.h>
+#include <talloc.h>
+/* Allow use of deprecated function tevent_loop_allow_nesting() */
+#define TEVENT_DEPRECATED
+#include <tevent.h>
+#include <tdb.h>
+
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+#include "lib/util/substitute.h"
+#include "lib/util/time.h"
+
+#include "ctdb_logging.h"
+#include "../include/ctdb_version.h"
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+
+#include "common/cmdline.h"
+#include "common/rb_tree.h"
 #include "common/system.h"
 
 #define ERR_TIMEOUT    20      /* timed out trying to reach node */

diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c
index ca897b16c211e01fb519fb6b5c7f18d5f49ed0cf..13c2d6fea1fa044ff060c9e92037b3ac35bc3ae2 100644 (file)
--- a/ctdb/utils/pmda/pmda_ctdb.c
+++ b/ctdb/utils/pmda/pmda_ctdb.c
@@ -19,14 +19,25 @@
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+#include "replace.h"
+#include "system/network.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/time.h"
+
+#include "ctdb_private.h"
+#include "ctdb_client.h"
+#include "ctdb_protocol.h"
+
+#include "common/system.h"
+
 #include <pcp/pmapi.h>
 #include <pcp/impl.h>
 #include <pcp/pmda.h>
-#include "includes.h"
-#include "ctdb_private.h"
-#include "ctdb_protocol.h"
+
 #include "domain.h"
-#include "common/system.h"
 
 /*
  * CTDB PMDA