align with HEAD

diff --git a/servers/slapd/back-monitor/back-monitor.h b/servers/slapd/back-monitor/back-monitor.h
index 9bc463a1b50ea8723d2e83f2982bb64195771054..a16f8fb7d9e369a442fffab8247e9e9a9a70cace 100644 (file)
--- a/servers/slapd/back-monitor/back-monitor.h
+++ b/servers/slapd/back-monitor/back-monitor.h
@@ -34,10 +34,10 @@
 #ifndef _BACK_MONITOR_H_
 #define _BACK_MONITOR_H_
 
-#include <slap.h>
-#include <avl.h>
 #include <ldap_pvt.h>
 #include <ldap_pvt_thread.h>
+#include <avl.h>
+#include <slap.h>
 
 LDAP_BEGIN_DECL
 

diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index 937b44d2f64a1cfee0f1971e865fd738ace5d417..747fd47ba4aedd1b83075eb236335a9a80eec796 100644 (file)
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -34,9 +34,9 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include "lutil.h"
 
 #include "slap.h"
+#include "lutil.h"
 #include "back-monitor.h"
 
 #define CONN_CN_PREFIX "Connection"

diff --git a/servers/slapd/back-monitor/time.c b/servers/slapd/back-monitor/time.c
index 47b3059901edf01447cc5d6fd11c55d9a4a6f5bd..1dfe0ae82fdb212ba62d60d77ae0f99d9b203254 100644 (file)
--- a/servers/slapd/back-monitor/time.c
+++ b/servers/slapd/back-monitor/time.c
@@ -37,9 +37,9 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include <lutil.h>
 
 #include "slap.h"
+#include <lutil.h>
 #include "proto-slap.h"
 #include "back-monitor.h"