diff --git a/dlls/kernel/kernel16_private.h b/dlls/kernel/kernel16_private.h
index 02ce3493f8c..2f4cf012a7e 100644
--- a/dlls/kernel/kernel16_private.h
+++ b/dlls/kernel/kernel16_private.h
@@ -24,7 +24,6 @@
 #include "wine/winbase16.h"
 #include "winreg.h"
 #include "winternl.h"
-#include "module.h"
 
 #include "pshpack1.h"
 
@@ -69,6 +68,32 @@ typedef struct _NE_MODULE
     HANDLE    fd;               /* 4c handle to the binary file */
 } NE_MODULE;
 
+typedef struct
+{
+    BYTE type;
+    BYTE flags;
+    BYTE segnum;
+    WORD offs;
+} ET_ENTRY;
+
+typedef struct
+{
+    WORD first; /* ordinal */
+    WORD last;  /* ordinal */
+    WORD next;  /* bundle */
+} ET_BUNDLE;
+
+
+  /* In-memory segment table */
+typedef struct
+{
+    WORD      filepos;   /* Position in file, in sectors */
+    WORD      size;      /* Segment size on disk */
+    WORD      flags;     /* Segment flags */
+    WORD      minsize;   /* Min. size of segment in memory */
+    HANDLE16  hSeg;      /* Selector or handle (selector - 1) of segment in memory */
+} SEGTABLEENTRY;
+
 /* this structure is always located at offset 0 of the DGROUP segment */
 typedef struct
 {
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 973a8d9863c..0dac34a1753 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -37,6 +37,7 @@
 #include "module.h"
 #include "wine/exception.h"
 #include "excpt.h"
+#include "wine/library.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "wine/server.h"
diff --git a/include/module.h b/include/module.h
index 99baec92b14..95c07d69531 100644
--- a/include/module.h
+++ b/include/module.h
@@ -24,39 +24,6 @@
 #include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
-#include <winreg.h>
-#include <wine/windef16.h>
-#include <wine/winbase16.h>
-#include <winternl.h>
-
-#include <pshpack1.h>
-
-typedef struct {
-    BYTE type;
-    BYTE flags;
-    BYTE segnum;
-    WORD offs;
-} ET_ENTRY;
-
-typedef struct {
-    WORD first; /* ordinal */
-    WORD last; /* ordinal */
-    WORD next; /* bundle */
-} ET_BUNDLE;
-
-
-  /* In-memory segment table */
-typedef struct
-{
-    WORD      filepos;   /* Position in file, in sectors */
-    WORD      size;      /* Segment size on disk */
-    WORD      flags;     /* Segment flags */
-    WORD      minsize;   /* Min. size of segment in memory */
-    HANDLE16  hSeg;      /* Selector or handle (selector - 1) */
-                         /* of segment in memory */
-} SEGTABLEENTRY;
-
-#include <poppack.h>
 
 enum loadorder_type
 {