diff --git a/reactos/dk/w32/Makefile b/reactos/dk/w32/Makefile
index 94a4d3c53b3..6c4a6d6ec33 100644
--- a/reactos/dk/w32/Makefile
+++ b/reactos/dk/w32/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2003/01/07 18:20:34 robd Exp $
+# $Id: Makefile,v 1.6 2003/09/15 02:48:15 vizzini Exp $
 #
 # PROJECT    : ReactOS Operating System
 # FILE       : reactos/dk/w32/Makefile
@@ -54,7 +54,8 @@ MODULES_CRT=\
 	$(TARGET_FOLDER_LIB)/msvcrt.a
 
 MODULES_MISC=\
-	$(TARGET_FOLDER_LIB)/version.a
+	$(TARGET_FOLDER_LIB)/version.a\
+	$(TARGET_FOLDER_LIB)/winmm.a
 
 MODULES_WINE=\
 	$(TARGET_FOLDER_LIB)/libwine.a\
@@ -129,11 +130,11 @@ $(TARGET_FOLDER_LIB)/shell32.a: $(PATH_TO_TOP)/lib/shell32/shell32.def
 		-D shell32.dll\
 		-d $(PATH_TO_TOP)/lib/shell32/shell32.def
 
-$(TARGET_FOLDER_LIB)/comctl32.a: $(PATH_TO_TOP)/../wine/dlls/comctl32/comctl32.def
+$(TARGET_FOLDER_LIB)/comctl32.a: $(PATH_TO_TOP)/lib/comctl32/comctl32.def
 	$(DLLTOOL) \
 		$(DTFLAGS)\
 		-D comctl32.dll\
-		-d $(PATH_TO_TOP)/../wine/dlls/comctl32/comctl32.def
+		-d $(PATH_TO_TOP)/lib/comctl32/comctl32.def
 
 
 $(TARGET_FOLDER_LIB)/$(SHELL32_ALIAS).a: $(PATH_TO_TOP)/lib/shell32/shell32.def
@@ -231,6 +232,12 @@ $(TARGET_FOLDER_LIB)/version.a: $(PATH_TO_TOP)/lib/version/version.def
 		-D version.dll\
 		-d $(PATH_TO_TOP)/lib/version/version.def
 
+$(TARGET_FOLDER_LIB)/winmm.a: $(PATH_TO_TOP)/lib/winmm/winmm.def
+	$(DLLTOOL) \
+		$(DTFLAGS)\
+		-D winmm.dll\
+		-d $(PATH_TO_TOP)/lib/winmm/winmm.def
+
 # --- WINE ---
 
 $(TARGET_FOLDER_LIB)/ole32.a: $(PATH_TO_TOP)/../wine/dlls/ole32/ole32.def
diff --git a/reactos/include/wine/debugtools.h b/reactos/include/wine/debugtools.h
index 242df8dbd6e..87e71b17760 100644
--- a/reactos/include/wine/debugtools.h
+++ b/reactos/include/wine/debugtools.h
@@ -1,17 +1,8 @@
 #ifndef __WINE_DEBUGTOOLS_H
 #define __WINE_DEBUGTOOLS_H
 
-#ifndef __NTDLL__
-
 #include <stdarg.h>
-#include "config.h"
-#include "windef.h"
-
-#else
-
-#include <windows.h>
-
-#endif /* __NTDLL__ */
+#include <wchar.h>
 
 struct _GUID;
 
@@ -110,10 +101,6 @@ inline static const char *debugres_w( const WCHAR *s ) { return wine_dbgstr_wn(
 
 #define WINE_DEFAULT_DEBUG_CHANNEL(ch) DEFAULT_DEBUG_CHANNEL(ch)
 
-#define WINE_DEFAULT_DEBUG_CHANNEL(ch) DEFAULT_DEBUG_CHANNEL(ch)
-
-#define WINE_DEFAULT_DEBUG_CHANNEL(ch) DEFAULT_DEBUG_CHANNEL(ch)
-
 #define DPRINTF wine_dbg_printf
 #define MESSAGE wine_dbg_printf
 
diff --git a/reactos/include/wine/port.h b/reactos/include/wine/port.h
index 2a768578524..d3d1bde9a48 100644
--- a/reactos/include/wine/port.h
+++ b/reactos/include/wine/port.h
@@ -13,7 +13,4 @@ typedef short     INT16;
 #define snprintf _snprintf
 #define strcasecmp _stricmp
 
-/* Wine debugging porting */
-#include "debugtools.h"
-
 #endif /* _ROS_WINE_PORT */
diff --git a/reactos/lib/user32/user32.def b/reactos/lib/user32/user32.def
index 99f38d9b737..c5a4dda4513 100644
--- a/reactos/lib/user32/user32.def
+++ b/reactos/lib/user32/user32.def
@@ -183,7 +183,7 @@ DrawCaptionTempW@28
 DrawEdge@16
 DrawFocusRect@8
 DrawFrame@16
-DrawFrameControl
+DrawFrameControl@16
 DrawIcon@16
 DrawIconEx@36
 DrawMenuBar@4
diff --git a/reactos/lib/winedbgc/porting.h b/reactos/lib/winedbgc/porting.h
index 45a853947d4..675d79b708c 100644
--- a/reactos/lib/winedbgc/porting.h
+++ b/reactos/lib/winedbgc/porting.h
@@ -42,7 +42,9 @@ long interlocked_xchg_add(long *dest, long incr);
 #define snprintf _snprintf
 #define strcasecmp _stricmp
 
+#ifdef __USE_W32API
 #define SLOWORD(l) ((SHORT)(LONG)(l))
 #define SHIWORD(l) ((SHORT)((LONG)(l) >> 16))
+#endif
 
 #endif  /* __PORTING_WINE2ROS_H */
diff --git a/reactos/lib/winedbgc/trace.h b/reactos/lib/winedbgc/trace.h
index bbd863afc1e..2f1defe4154 100644
--- a/reactos/lib/winedbgc/trace.h
+++ b/reactos/lib/winedbgc/trace.h
@@ -47,9 +47,6 @@ void Assert(void* assert, TCHAR* file, int line, void* msg);
 void Trace(TCHAR* lpszFormat, ...);
 void Trace1(int code, TCHAR* lpszFormat, ...);
 
-#define TRACE  Trace
-#define TRACE0 Trace
-
 #else   // _DEBUG
 
 #ifndef ASSERT
@@ -57,15 +54,9 @@ void Trace1(int code, TCHAR* lpszFormat, ...);
 #define ASSERTMSG(exp, msg)
 #endif
 
-//#define TRACE0 TRACE
-//#define TRACE1 TRACE
-
 void Assert(void* assert, TCHAR* file, int line, void* msg);
 void Trace(TCHAR* lpszFormat, ...);
 
-#define TRACE 0 ? (void)0 : Trace
-
-
 #endif // !_DEBUG
 
 #endif // __TRACE_H__