Index: /trunk/kDbg/Makefile.kmk
===================================================================
--- /trunk/kDbg/Makefile.kmk	(revision 5)
+++ /trunk/kDbg/Makefile.kmk	(revision 6)
@@ -36,4 +36,5 @@
 kDbg_SOURCES := \
 	kDbgModule.cpp \
+	kDbgModLdr.cpp \
 	kDbgLine.cpp \
 	kDbgSymbol.cpp
@@ -49,4 +50,5 @@
 kDbgStatic_DEFS = KDBG_BUILDING
 kDbgStatic_SOURCES = $(kDbg_SOURCES)
+kDbgStatic_SOURCES.win = $(kDbg_SOURCES.win)
 
 #
Index: /trunk/kDbg/kDbgModLdr.cpp
===================================================================
--- /trunk/kDbg/kDbgModLdr.cpp	(revision 5)
+++ /trunk/kDbg/kDbgModLdr.cpp	(revision 6)
@@ -35,5 +35,5 @@
 *******************************************************************************/
 #include <k/kDbg.h>
-#include "kLdr.h"
+#include <k/kLdr.h>
 #include "kDbgInternal.h"
 
@@ -57,5 +57,5 @@
  * @copydoc KDBGMODOPS::pfnQueryLine
  */
-static int kDbgModPeQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
+static int kDbgModLdrQueryLine(PKDBGMOD pMod, KI32 iSegment, KDBGADDR uOffset, PKDBGLINE pLine)
 {
     //PKDBGMODLDR pThis = (PKDBGMODLDR)pMod;
@@ -67,5 +67,5 @@
  * @copydoc KDBGMODOPS::pfnQuerySymbol
  */
-static int kDbgModPeQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
+static int kDbgModLdrQuerySymbol(PKDBGMOD pMod, KI32 iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
 {
     //PKDBGMODLDR pThis = (PKDBGMODLDR)pMod;
@@ -87,5 +87,5 @@
  * @copydocs  KDBGMODOPS::pfnOpen.
  */
-static int kDbgModLdrOpen(PKDBGHLPFILE pFile, KFOFF off, KFOFF cb, PKLDRMOD pLdrMod, PKDBGMOD *ppMod)
+static int kDbgModLdrOpen(PKDBGMOD *ppMod, PKRDR pRdr, KBOOL fCloseRdr, KFOFF off, KFOFF cb, struct KLDRMOD *pLdrMod)
 {
     return KERR_NOT_IMPLEMENTED;
@@ -96,11 +96,12 @@
  * Methods for a PE module.
  */
-const KDBGMODOPS g_kDbgModPeOps =
+const KDBGMODOPS g_kDbgModLdr =
 {
     "kLdr",
+    NULL,
     kDbgModLdrOpen,
     kDbgModLdrClose,
     kDbgModLdrQuerySymbol,
-    kDbgModLdrQueryLine
+    kDbgModLdrQueryLine,
     "kLdr"
 };
Index: /trunk/kDbg/kDbgModWinDbgHelp.cpp
===================================================================
--- /trunk/kDbg/kDbgModWinDbgHelp.cpp	(revision 5)
+++ /trunk/kDbg/kDbgModWinDbgHelp.cpp	(revision 6)
@@ -714,5 +714,5 @@
  * Methods for a PE module.
  */
-const KDBGMODOPS g_kDbgModWinDbgHelpOpen =
+KDBGMODOPS const g_kDbgModWinDbgHelpOpen =
 {
     "Windows DbgHelp",