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>

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 "replace.h"
-#include "lib/tdb_wrap/tdb_wrap.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.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"
 

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 "system/network.h"
-#include "../include/ctdb_client.h"
+
-#include "../include/ctdb_private.h"
+#include <popt.h>
-#include "../common/rb_tree.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
  */
 

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 "system/network.h"
-#include "../include/ctdb_private.h"
+
-#include "../common/rb_tree.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, ...)

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 "replace.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "../include/ctdb_private.h"
+
-#include "../include/ctdb_client.h"
+#include <tdb.h>
-#include <stdarg.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"
 

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 "replace.h"
-#include "tdb.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

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 "replace.h"
-#include "tdb.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"
 

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)) { \

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>

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"

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>

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>

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>

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>

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"

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 "replace.h"
-#include <system/network.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"
 

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 "replace.h"
-#include <system/network.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)
 {

ctdb/ib/ibwrapper.c

@@ -20,28 +20,24 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
+#include "replace.h"
-#include <string.h>
+#include "system/network.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 <assert.h>
-#include <unistd.h>
 
-#include "includes.h"
+#include <assert.h>
-#include "ibwrapper.h"
+#include <talloc.h>
+#include <tevent.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];

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 "replace.h"
-#include <string.h>
+#include "system/network.h"
-#include <stdio.h>
+#include "system/time.h"
-#include <errno.h>
+
-#include <sys/types.h>
+#include <assert.h>
-#include <netinet/in.h>
+#include <talloc.h>
-#include <sys/socket.h>
+#include <tevent.h>
-#include <netdb.h>
+
-#include <arpa/inet.h>
+#include "lib/util/time.h"
-#include <malloc.h>
+#include "lib/util/debug.h"
-#include <assert.h>
+
-#include <unistd.h>
+#include "ctdb_logging.h"
-#include <signal.h>
-#include <sys/time.h>
-#include <time.h>
 
-#include "includes.h"
 #include "ib/ibwrapper.h"
 
 struct ibwtest_ctx {

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 "replace.h"
-#include "tdb.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,

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 "replace.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.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"
 

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 "replace.h"
-#include "tdb.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"
 
 

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 "replace.h"
-#include "lib/tdb_wrap/tdb_wrap.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.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 "ctdb_private.h"
-#include "../include/ctdb_private.h"
+#include "ctdb_client.h"
-#include "../common/rb_tree.h"
+#include "ctdb_logging.h"
-#include <sys/socket.h>
+
+#include "common/rb_tree.h"
 #include "common/reqid.h"
 #include "common/system.h"
 

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;

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 "replace.h"
-#include "tdb.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"
 
 
 /**

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"
 
 
 /*

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 "replace.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 "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"
 
 /*

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 "replace.h"
-#include "tdb.h"
 #include "system/filesys.h"
+#include "system/network.h"
+
+#include <talloc.h>
+
 #include "ctdb_private.h"
+
 #include "common/system.h"
 
 static char *progname = NULL;

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 "replace.h"
-#include "../include/ctdb_client.h"
+#include "system/filesys.h"
-#include "../include/ctdb_private.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 {

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 "replace.h"
-#include "../include/ctdb_client.h"
-#include "../include/ctdb_private.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"

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

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 "replace.h"
-#include "tdb.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/dir.h"
 #include "system/time.h"
-#include "../include/ctdb_private.h"
+#include "system/locale.h"
-#include "../common/rb_tree.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"
 

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 {

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 "lib/util/debug.h"
-#include "../include/ctdb_private.h"
+#include "lib/util/samba_util.h"
+
+#include "ctdb_private.h"
+#include "ctdb_logging.h"
+
 #include "common/reqid.h"
 
 struct ctdb_persistent_state {

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 "replace.h"
-#include "tdb.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 

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 <popt.h>
-#include "../include/ctdb_client.h"
+#include <talloc.h>
-#include "../include/ctdb_private.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 */

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 "replace.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.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

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 "replace.h"
-#include "../include/ctdb_private.h"
+#include "system/network.h"
-#include "../common/rb_tree.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"
 
 

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 "replace.h"
-#include <string.h>
+#include "system/network.h"
-#include "../include/ctdb_private.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,

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 "replace.h"
-#include "tdb.h"
-#include "lib/util/dlinklist.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"
 

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"
 

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 "replace.h"
-#include "../include/ctdb_private.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;

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 {

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 "replace.h"
-#include "../include/ctdb_private.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

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 "replace.h"
-#include "tdb.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "system/dir.h"
+#include "system/time.h"
-#include "../include/ctdb_private.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 "lib/util/debug.h"
-#include "../common/rb_tree.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)

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;

ctdb/server/eventscript.c

@@ -17,17 +17,28 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
-#include <time.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 "system/time.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_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);

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 "replace.h"
-#include "tdb.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"
 
 /*

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 "replace.h"
-#include "tdb.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)

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 "replace.h"
-#include "lib/util/dlinklist.h"
-#include "tdb.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"
 
 

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 "system/network.h"
-#include "cmdline.h"
-#include "ctdb_client.h"
-#include "ctdb_private.h"
 
-#include <sys/time.h>
+#include <popt.h>
-#include <time.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/time.h"
+#include "lib/util/debug.h"
+
+#include "common/cmdline.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+#include "ctdb_client.h"
 
 static struct timeval tp1,tp2;
 

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 "system/network.h"
-#include "cmdline.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;
 

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 "system/network.h"
-#include "cmdline.h"
 
-#include <sys/time.h>
+#include <popt.h>
-#include <time.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;

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;
 

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 "system/network.h"
-#include <poll.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";
 

ctdb/tests/src/ctdb_lock_tdb.c

@@ -1,7 +1,7 @@
-#include <stdio.h>
+#include "replace.h"
-#include <fcntl.h>
+#include "system/filesys.h"
 
-#include "includes.h"
+#include <tdb.h>
 
 const char *tdb_file;
 TDB_CONTEXT *tdb;

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 "system/network.h"
-#include "cmdline.h"
 
-#include <sys/time.h>
+#include <popt.h>
-#include <time.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;
 

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 "replace.h"
-#include "include/ctdb_private.h"
 #include "system/filesys.h"
-#include "popt.h"
+#include "system/network.h"
-#include "cmdline.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;

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 "system/network.h"
-#include "cmdline.h"
+#include "system/time.h"
-#include "ctdb_private.h"
 
-#include <sys/time.h>
+#include <popt.h>
-#include <time.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/debug.h"
+#include "lib/util/time.h"
+
+#include "common/cmdline.h"
+
+#include "ctdb_logging.h"
+#include "ctdb_private.h"
+#include "ctdb_client.h"
 
 static struct timeval tp1,tp2;
 

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 "system/network.h"
-#include "cmdline.h"
 
-#include <sys/time.h>
+#include <popt.h>
-#include <time.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;

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 <popt.h>
-#include "ctdb_private.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];

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 "system/network.h"
-#include "cmdline.h"
 
-#include <sys/time.h>
+#include <popt.h>
-#include <time.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;
 

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 "system/network.h"
-#include "cmdline.h"
 
-#include <sys/time.h>
+#include <popt.h>
-#include <time.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";
 

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 "system/network.h"
-#include "cmdline.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;
 

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 "replace.h"
-#include "lib/tdb_wrap/tdb_wrap.h"
 #include "system/filesys.h"
-#include "popt.h"
+#include "system/network.h"
-#include "cmdline.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,

ctdb/tests/src/ctdbd_test.c

@@ -20,8 +20,14 @@
 #ifndef _CTDBD_TEST_C
 #define _CTDBD_TEST_C
 
-#include "includes.h"
+#include "replace.h"
-#include "tdb.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"
 
 /*

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 "replace.h"
-#include "lib/util/dlinklist.h"
 #include "system/filesys.h"
-#include "popt.h"
+#include "system/time.h"
-#include "cmdline.h"
 
-#include <sys/time.h>
+#include <popt.h>
-#include <time.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/dlinklist.h"
+
+#include "common/cmdline.h"
 #include "common/rb_tree.h"
 
 static struct timeval tp1,tp2;

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 <popt.h>
-#include "../include/ctdb_version.h"
+#include <talloc.h>
-#include "../include/ctdb_client.h"
+/* Allow use of deprecated function tevent_loop_allow_nesting() */
-#include "../include/ctdb_private.h"
+#define TEVENT_DEPRECATED
-#include "../common/rb_tree.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/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 */

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