Index: /trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp
===================================================================
--- /trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp	(revision 58741)
+++ /trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp	(revision 58742)
@@ -29,7 +29,6 @@
 #include <iprt/stream.h>
 #include <iprt/string.h>
-
-#include "../Runtime/include/internal/ldrMZ.h"  /* ugly */
-#include "../Runtime/include/internal/ldrPE.h"  /* ugly */
+#include <iprt/formats/pecoff.h>
+#include <iprt/formats/mz.h>
 
 
Index: /trunk/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp	(revision 58741)
+++ /trunk/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp	(revision 58742)
@@ -60,8 +60,8 @@
 #include <iprt/strcache.h>
 #include "internal/dbgmod.h"
-#include "internal/ldrPE.h"
 #include "internal/magics.h"
 
 #include <iprt/formats/codeview.h>
+#include <iprt/formats/pecoff.h>
 
 
Index: /trunk/src/VBox/Runtime/common/ldr/ldrEx.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/ldr/ldrEx.cpp	(revision 58741)
+++ /trunk/src/VBox/Runtime/common/ldr/ldrEx.cpp	(revision 58742)
@@ -40,6 +40,6 @@
 #include <iprt/sha.h>
 #include <iprt/string.h>
+#include <iprt/formats/mz.h>
 #include "internal/ldr.h"
-#include "internal/ldrMZ.h"
 
 #ifdef LDR_ONLY_PE
Index: /trunk/src/VBox/Runtime/common/ldr/ldrFile.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/ldr/ldrFile.cpp	(revision 58741)
+++ /trunk/src/VBox/Runtime/common/ldr/ldrFile.cpp	(revision 58742)
@@ -39,6 +39,6 @@
 #include <iprt/err.h>
 #include <iprt/string.h>
+#include <iprt/formats/mz.h>
 #include "internal/ldr.h"
-#include "internal/ldrMZ.h"