diff --git a/ctdb/include/internal/includes.h b/ctdb/include/internal/includes.h
index 7ffe7d97d03..6c00c037d6c 100644
--- a/ctdb/include/internal/includes.h
+++ b/ctdb/include/internal/includes.h
@@ -1,23 +1,24 @@
 #ifndef _CTDB_INCLUDES_H
 #define _CTDB_INCLUDES_H
 
+/* Replace must be before broken tdb.h to define bool */
 #include "replace.h"
-#include "talloc.h"
 #include "system/wait.h"
 #include "system/network.h"
-#include "tdb.h"
-#include "ctdb_client.h"
+
+#include <talloc.h>
+#include <tdb.h>
 
 /* Allow use of deprecated function tevent_loop_allow_nesting() */
 #define TEVENT_DEPRECATED
 /* Saves ctdb from massive churn. */
 #define TEVENT_COMPAT_DEFINES 1
-
-#include "tevent.h"
-
-#include "ctdb_logging.h"
+#include <tevent.h>
 
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
 
+#include "ctdb_client.h"
+#include "ctdb_logging.h"
+
 #endif /* _CTDB_INCLUDES_H */