diff --git a/reactos/subsys/win32k/eng/debug.c b/reactos/subsys/win32k/eng/debug.c
index f131508b87d..c005fc5e34f 100644
--- a/reactos/subsys/win32k/eng/debug.c
+++ b/reactos/subsys/win32k/eng/debug.c
@@ -10,7 +10,7 @@
 
 #include <ddk/ntddk.h>
 
-VOID EngDebugPrint(PCHAR StandardPrefix, PCHAR DebugMessage, va_list ap)
+VOID STDCALL EngDebugPrint(PCHAR StandardPrefix, PCHAR DebugMessage, va_list ap)
 {
   DbgPrint(StandardPrefix);
   DbgPrint(DebugMessage, ap);
diff --git a/reactos/subsys/win32k/eng/mem.c b/reactos/subsys/win32k/eng/mem.c
index 54fb4ebb3f8..6c8300f3d7a 100644
--- a/reactos/subsys/win32k/eng/mem.c
+++ b/reactos/subsys/win32k/eng/mem.c
@@ -9,8 +9,9 @@
  */
 
 #include <ddk/ntddk.h>
+#include <ddk/winddi.h>
 
-PVOID EngAllocMem(ULONG Flags, ULONG MemSize, ULONG Tag)
+PVOID STDCALL EngAllocMem(ULONG Flags, ULONG MemSize, ULONG Tag)
 {
    PVOID newMem;
 
@@ -24,12 +25,12 @@ PVOID EngAllocMem(ULONG Flags, ULONG MemSize, ULONG Tag)
    return newMem;
 }
 
-VOID EngFreeMem(PVOID Mem)
+VOID STDCALL EngFreeMem(PVOID Mem)
 {
    ExFreePool(Mem);
 }
 
-PVOID EngAllocUserMem(ULONG cj, ULONG tag)
+PVOID STDCALL EngAllocUserMem(ULONG cj, ULONG tag)
 {
    PVOID newMem;
 
@@ -37,7 +38,8 @@ PVOID EngAllocUserMem(ULONG cj, ULONG tag)
      MEM_COMMIT, PAGE_READWRITE); */
 }
 
-VOID EngFreeUserMem(PVOID pv)
+VOID STDCALL EngFreeUserMem(PVOID pv)
 {
 /*   ZwFreeVirtualMemory (mycurrentprocess, pv, 0, MEM_DECOMMIT); */
 }
+
diff --git a/reactos/subsys/win32k/makefile b/reactos/subsys/win32k/makefile
index 3f4887bdec1..e3bcc8ffb76 100644
--- a/reactos/subsys/win32k/makefile
+++ b/reactos/subsys/win32k/makefile
@@ -6,6 +6,7 @@ TARGET=win32k
 
 BASE_CFLAGS = -I../../include
 
+ENG_OBJECTS= eng/debug.o eng/mem.o
 MAIN_OBJECTS = main/dllmain.o
 MISC_OBJECTS = misc/driver.o
 OBJECTS_OBJECTS = objects/bitmaps.o objects/brush.o objects/cliprgn.o  \
@@ -17,7 +18,7 @@ OBJECTS_OBJECTS = objects/bitmaps.o objects/brush.o objects/cliprgn.o  \
 RESOURCE_OBJECT = $(TARGET).coff
 STUBS_OBJECTS = stubs/stubs.o
 
-OBJECTS = $(MAIN_OBJECTS) $(MISC_OBJECTS) $(OBJECTS_OBJECTS)  \
+OBJECTS = $(ENG_OBJECTS) $(MAIN_OBJECTS) $(MISC_OBJECTS) $(OBJECTS_OBJECTS)  \
           $(RESOURCE_OBJECT) $(STUBS_OBJECTS) 
 
 all: $(TARGET).sys
@@ -87,7 +88,7 @@ else
 endif
 
 #WITH_DEBUGGING = yes
-WIN32_LEAN_AND_MEAN = yes
+#WIN32_LEAN_AND_MEAN = yes
 #WARNINGS_ARE_ERRORS = yes
 include ../../rules.mak
 
diff --git a/reactos/subsys/win32k/win32k.def b/reactos/subsys/win32k/win32k.def
index 254b81fed0e..299c2f6e3f8 100644
--- a/reactos/subsys/win32k/win32k.def
+++ b/reactos/subsys/win32k/win32k.def
@@ -1,4 +1,4 @@
-; $Id: win32k.def,v 1.4 1999/07/17 23:10:31 ea Exp $
+; $Id: win32k.def,v 1.5 1999/10/23 22:40:49 rex Exp $
 ;
 ; win32k.def
 ;
@@ -14,8 +14,8 @@ CLIPOBJ_bEnum
 CLIPOBJ_cEnumStart
 CLIPOBJ_ppoGetPath
 EngAcquireSemaphore
-EngAllocMem
-EngAllocUserMem
+EngAllocMem@12
+EngAllocUserMem@8
 EngAssociateSurface
 EngBitBlt
 EngCheckAbort
@@ -33,7 +33,7 @@ EngCreateSemaphore
 EngCreateWnd
 ; EngDebugBreak = NTOSKRNL.DbgBreakPoint
 EngDebugBreak
-EngDebugPrint
+EngDebugPrint@12
 EngDeleteClip
 EngDeleteDriverObj
 EngDeleteEvent
@@ -48,9 +48,9 @@ EngEraseSurface
 EngFillPath
 EngFindImageProcAddress
 EngFindResource
-EngFreeMem
+EngFreeMem@4
 EngFreeModule
-EngFreeUserMem
+EngFreeUserMem@4
 EngGetCurrentCodePage
 EngGetDriverName
 EngGetFileChangeTime