diff --git a/sesman/access.c b/sesman/access.c
index 6c7eb264..d3cb98f7 100644
--- a/sesman/access.c
+++ b/sesman/access.c
@@ -28,7 +28,13 @@
 #include <config_ac.h>
 #endif
 
+#include "arch.h"
+
+#include "access.h"
+#include "config.h"
+#include "log.h"
 #include "sesman.h"
+#include "os_calls.h"
 #include "string_calls.h"
 
 /******************************************************************************/
diff --git a/sesman/config.c b/sesman/config.c
index 23e7ff37..5776c13a 100644
--- a/sesman/config.c
+++ b/sesman/config.c
@@ -29,9 +29,10 @@
 #endif
 
 #include "arch.h"
+#include "config.h"
+
 #include "list.h"
 #include "file.h"
-#include "sesman.h"
 #include "log.h"
 #include "string_calls.h"
 #include "chansrv/chansrv_common.h"
diff --git a/sesman/env.c b/sesman/env.c
index 0a4e6220..e840de31 100644
--- a/sesman/env.c
+++ b/sesman/env.c
@@ -30,11 +30,15 @@
 
 #include <grp.h>
 
-#include "xrdp_sockets.h"
+#include "env.h"
+#include "config.h"
 #include "list.h"
+#include "log.h"
+#include "os_calls.h"
 #include "sesman.h"
 #include "ssl_calls.h"
 #include "string_calls.h"
+#include "xrdp_sockets.h"
 
 /******************************************************************************/
 int
diff --git a/sesman/sesman.c b/sesman/sesman.c
index 0e0c6bcb..86833e51 100644
--- a/sesman/sesman.c
+++ b/sesman/sesman.c
@@ -30,13 +30,18 @@
 
 #include <stdarg.h>
 
+#include "arch.h"
 #include "sesman.h"
-#include "xrdp_configure_options.h"
+
+#include "config.h"
+#include "lock_uds.h"
+#include "os_calls.h"
+#include "scp.h"
+#include "scp_process.h"
+#include "sig.h"
 #include "string_calls.h"
 #include "trans.h"
-
-#include "scp_process.h"
-#include "lock_uds.h"
+#include "xrdp_configure_options.h"
 
 /**
  * Maximum number of short-lived connections to sesman
@@ -72,14 +77,6 @@ tintptr g_term_event = 0;
 tintptr g_sigchld_event = 0;
 tintptr g_reload_event = 0;
 
-/**
- * Items stored on the g_con_list
- */
-struct sesman_con
-{
-    struct trans *t;
-};
-
 static struct trans *g_list_trans;
 
 /* Variables used to lock g_list_trans */
diff --git a/sesman/sesman.h b/sesman/sesman.h
index 785810d6..38231ec1 100644
--- a/sesman/sesman.h
+++ b/sesman/sesman.h
@@ -27,17 +27,13 @@
 #ifndef SESMAN_H
 #define SESMAN_H
 
-#include "arch.h"
-#include "parse.h"
-#include "os_calls.h"
-#include "log.h"
-#include "env.h"
-#include "auth.h"
-#include "config.h"
-#include "sig.h"
-#include "session.h"
-#include "access.h"
-#include "scp.h"
+/**
+ * Type for managing sesman connections from xrdp (etc)
+ */
+struct sesman_con
+{
+    struct trans *t;
+};
 
 /* Globals */
 extern struct config_sesman *g_cfg;
diff --git a/sesman/session.c b/sesman/session.c
index e00351cb..70ba972c 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -37,10 +37,19 @@
 #include <sys/prctl.h>
 #endif
 
+#include "arch.h"
+#include "session.h"
+
+#include "auth.h"
+#include "config.h"
+#include "env.h"
+#include "list.h"
+#include "log.h"
+#include "os_calls.h"
 #include "sesman.h"
+#include "string_calls.h"
 #include "xauth.h"
 #include "xrdp_sockets.h"
-#include "string_calls.h"
 
 #ifndef PR_SET_NO_NEW_PRIVS
 #define PR_SET_NO_NEW_PRIVS 38
diff --git a/sesman/sig.c b/sesman/sig.c
index 65c1d288..4b7b3ec9 100644
--- a/sesman/sig.c
+++ b/sesman/sig.c
@@ -28,8 +28,15 @@
 #include <config_ac.h>
 #endif
 
-#include "string_calls.h"
+#include "arch.h"
+#include "sig.h"
+
+#include "config.h"
+#include "log.h"
+#include "os_calls.h"
 #include "sesman.h"
+#include "session.h"
+#include "string_calls.h"
 
 /******************************************************************************/
 void