diff --git a/reactos/include/ndk/extypes.h b/reactos/include/ndk/extypes.h
index 21031e42614..b879d5c034a 100644
--- a/reactos/include/ndk/extypes.h
+++ b/reactos/include/ndk/extypes.h
@@ -20,10 +20,7 @@ extern NTOSAPI POBJECT_TYPE ExTimerType;
 
 /* CONSTANTS *****************************************************************/
 
-/* FIXME: Win32k uses windows.h! */
-#ifndef __WIN32K__
 #define INVALID_HANDLE_VALUE (HANDLE)-1
-#endif
 
 /* Callback Object Access Rights */
 #define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001)
diff --git a/reactos/include/ndk/i386/ketypes.h b/reactos/include/ndk/i386/ketypes.h
index b332101a505..70e2e4cc2a5 100644
--- a/reactos/include/ndk/i386/ketypes.h
+++ b/reactos/include/ndk/i386/ketypes.h
@@ -115,8 +115,6 @@ typedef struct _KTRAP_FRAME
     USHORT Reserved9;
 } KTRAP_FRAME, *PKTRAP_FRAME;
 
-/* FIXME: Win32k uses windows.h! */
-#ifndef __WIN32K__
 typedef struct _LDT_ENTRY
 {
     WORD LimitLow;
@@ -145,7 +143,6 @@ typedef struct _LDT_ENTRY
         } Bits;
     } HighWord;
 } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY;
-#endif
 
 typedef struct _KGDTENTRY
 {
diff --git a/reactos/include/subsys/csrss/csrss.h b/reactos/include/subsys/csrss/csrss.h
index 3f0eddfbd8e..c0c576b9409 100644
--- a/reactos/include/subsys/csrss/csrss.h
+++ b/reactos/include/subsys/csrss/csrss.h
@@ -1,7 +1,6 @@
 #ifndef __INCLUDE_CSRSS_CSRSS_H
 #define __INCLUDE_CSRSS_CSRSS_H
 
-#include <windows.h>
 #include <blue/ntddblue.h>
 
 #define CSR_NATIVE     0x0000
diff --git a/reactos/subsys/win32k/eng/xlate.c b/reactos/subsys/win32k/eng/xlate.c
index 3906dd10579..c48f64ac485 100644
--- a/reactos/subsys/win32k/eng/xlate.c
+++ b/reactos/subsys/win32k/eng/xlate.c
@@ -313,6 +313,7 @@ IntEngCreateMonoXlate(
    XlateGDI->SourcePal = PaletteSource;
 
    XlateObj->flXlate = XO_TO_MONO;
+   XlateObj->pulXlate = &XlateGDI->BackgroundColor;
    switch (SourcePalType)
    {
       case PAL_INDEXED:
@@ -478,10 +479,10 @@ XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color)
    if (XlateObj->flXlate & XO_TABLE)
       return XlateObj->pulXlate[Color];
 
-   XlateGDI = ObjToGDI(XlateObj, XLATE);
-
    if (XlateObj->flXlate & XO_TO_MONO)
-      return Color == XlateGDI->BackgroundColor;
+      return Color == XlateObj->pulXlate[0];
+
+   XlateGDI = ObjToGDI(XlateObj, XLATE);
 
    if (XlateGDI->UseShiftAndMask)
       return ShiftAndMask(XlateGDI, Color);
diff --git a/reactos/subsys/win32k/ntuser/misc.c b/reactos/subsys/win32k/ntuser/misc.c
index dda13a615f6..518ee4555dd 100644
--- a/reactos/subsys/win32k/ntuser/misc.c
+++ b/reactos/subsys/win32k/ntuser/misc.c
@@ -800,8 +800,8 @@ IntSystemParametersInfo(
 
   if (!bInitialized)
   {
-    ZeroMemory(&IconFont, sizeof(LOGFONTW));
-    ZeroMemory(&pMetrics, sizeof(NONCLIENTMETRICSW));
+    RtlZeroMemory(&IconFont, sizeof(LOGFONTW));
+    RtlZeroMemory(&pMetrics, sizeof(NONCLIENTMETRICSW));
 
     IntGetFontMetricSetting(L"CaptionFont", &pMetrics.lfCaptionFont);
     IntGetFontMetricSetting(L"SmCaptionFont", &pMetrics.lfSmCaptionFont);
diff --git a/reactos/subsys/win32k/ntuser/scrollbar.c b/reactos/subsys/win32k/ntuser/scrollbar.c
index 6fee997091a..f93dbf6bc3d 100644
--- a/reactos/subsys/win32k/ntuser/scrollbar.c
+++ b/reactos/subsys/win32k/ntuser/scrollbar.c
@@ -31,10 +31,6 @@
 
 #include <w32k.h>
 
-#ifdef __USE_W32API
-#include <oleacc.h>
-#endif
-
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c
index 2bbded89470..c6b8e44a88f 100644
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@@ -114,7 +114,7 @@ static CHARSETINFO FontTci[MAXTCIINDEX] = {
   { DEFAULT_CHARSET, 0, FS(0)},
   /* reserved for system */
   { DEFAULT_CHARSET, 0, FS(0)},
-  { SYMBOL_CHARSET, CP_SYMBOL, FS(31)},
+  { SYMBOL_CHARSET, 42 /* CP_SYMBOL */, FS(31)},
 };
 
 VOID FASTCALL
@@ -1044,7 +1044,7 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI)
   TEXTMETRICW *TM;
   NEWTEXTMETRICW *Ntm;
 
-  ZeroMemory(Info, sizeof(FONTFAMILYINFO));
+  RtlZeroMemory(Info, sizeof(FONTFAMILYINFO));
   Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL);
   Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT);
   if (NULL == Otm)
diff --git a/reactos/subsys/win32k/w32k.h b/reactos/subsys/win32k/w32k.h
index 4d85c84c526..e96fa5c1df9 100644
--- a/reactos/subsys/win32k/w32k.h
+++ b/reactos/subsys/win32k/w32k.h
@@ -8,17 +8,26 @@
 
 /* INCLUDES ******************************************************************/
 
-/* We are Win32K */
-#define __WIN32K__
-
 /* DDK/NDK/SDK Headers */
 #include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <ddk/winddi.h>
 #include <ddk/ntddmou.h>
-#include <windows.h>
+#include <ddk/ntifs.h>
 #include <ndk/ntndk.h>
 
+/* Win32 Headers */
+/* FIXME: Defines in winbase.h that we need... */
+typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
+#define WINBASEAPI
+#define STARTF_USESIZE 2
+#define STARTF_USEPOSITION 4
+#include <stdarg.h>
+#include <windef.h>
+#include <wingdi.h>
+#include <winddi.h>
+#include <winuser.h>
+#include <dde.h>
+#include <wincon.h>
+
 /* SEH Support with PSEH */
 #include <pseh/pseh.h>
 
diff --git a/reactos/w32api/include/basetyps.h b/reactos/w32api/include/basetyps.h
index ea110a11915..a3647fcf538 100644
--- a/reactos/w32api/include/basetyps.h
+++ b/reactos/w32api/include/basetyps.h
@@ -10,23 +10,25 @@
 # else
 #  define EXTERN_C extern
 # endif  /* __cplusplus */
-# ifndef __int64
-#  define __int64 long long
-# endif
-# ifndef __int32
-#  define __int32 long
-# endif
-# ifndef __int16
-#  define __int16 int
-# endif
-# ifndef __int8
-#  define __int8 char
+# ifndef _MSC_VER
+#  ifndef __int64
+#   define __int64 long long
+#  endif
+#  ifndef __int32
+#   define __int32 long
+#  endif
+#  ifndef __int16
+#   define __int16 int
+#  endif
+#  ifndef __int8
+#   define __int8 char
+#  endif
 # endif
 # ifndef __small
 #  define __small char
 # endif
 # ifndef __hyper
-#  define __hyper long long
+#  define __hyper __int64
 # endif
 # define STDMETHODCALLTYPE	__stdcall
 # define STDMETHODVCALLTYPE	__cdecl
diff --git a/reactos/w32api/include/ddk/ddrawi.h b/reactos/w32api/include/ddk/ddrawi.h
index 894676f7e7c..77ecb1e3047 100644
--- a/reactos/w32api/include/ddk/ddrawi.h
+++ b/reactos/w32api/include/ddk/ddrawi.h
@@ -616,14 +616,13 @@ typedef struct _DDHAL_GETDRIVERINFODATA {
 /*****************************************************************************
  * high-level ddraw implementation structures
  */
-#ifndef __USE_W32API
-typedef DWORD IUnknown; /* FIXME: implement proper definition */
-#endif
+#ifndef _NO_COM
 typedef struct _IUNKNOWN_LIST {
     struct _IUNKNOWN_LIST *	lpLink;
     LPGUID			lpGuid;
     IUnknown *			lpIUnknown;
 } IUNKNOWN_LIST,*LPIUNKNOWN_LIST;
+#endif /* _NO_COM */
 
 typedef struct _PROCESS_LIST {
     struct _PROCESS_LIST *	lpLink;
@@ -669,6 +668,7 @@ typedef struct _DDRAWI_DIRECTDRAW_INT {
     DWORD			dwIntRefCnt;
 } DDRAWI_DIRECTDRAW_INT;
 
+#ifndef _NO_COM
 typedef struct _DDRAWI_DIRECTDRAW_LCL {
     DWORD			lpDDMore;
     LPDDRAWI_DIRECTDRAW_GBL	lpGbl;
@@ -701,6 +701,7 @@ typedef struct _DDRAWI_DIRECTDRAW_LCL {
     ULONG_PTR			hGammaCalibrator;
     LPDDGAMMACALIBRATORPROC	lpGammaCalibrator;
 } DDRAWI_DIRECTDRAW_LCL;
+#endif /* _NO_COM */
 
 #define DDRAWILCL_HASEXCLUSIVEMODE	0x00000001
 #define DDRAWILCL_ISFULLSCREEN		0x00000002
@@ -896,6 +897,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE {
 #define GET_LPDDRAWSURFACE_GBL_MORE(psurf_gbl) \
     (*(((LPDDRAWI_DDRAWSURFACE_GBL_MORE *)(psurf_gbl)) - 1))
 
+#ifndef _NO_COM
 typedef struct _DDRAWI_DDRAWSURFACE_MORE {
     DWORD			dwSize;
     IUNKNOWN_LIST *		lpIUnknowns;
@@ -930,6 +932,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_MORE {
     DWORD			dwFVF;
     LPVOID			lpVB;
 } DDRAWI_DDRAWSURFACE_MORE;
+#endif /* _NO_COM */
 
 typedef struct _DDRAWI_DDRAWSURFACE_LCL {
     LPDDRAWI_DDRAWSURFACE_MORE	lpSurfMore;
@@ -1031,6 +1034,7 @@ typedef struct _DDRAWI_DDRAWPALETTE_GBL {
 #define DDRAWIPAL_STORED_8INDEX	0x00001000
 #define DDRAWIPAL_ALPHA		0x00002000
 
+#ifndef _NO_COM
 typedef struct _DDRAWI_DDRAWPALETTE_LCL {
     DWORD			lpPalMore;
     LPDDRAWI_DDRAWPALETTE_GBL	lpGbl;
@@ -1044,6 +1048,7 @@ typedef struct _DDRAWI_DDRAWPALETTE_LCL {
     ULONG_PTR			dwDDRAWReserved2;
     ULONG_PTR			dwDDRAWReserved3;
 } DDRAWI_DDRAWPALETTE_LCL;
+#endif /* _NO_COM */
 
 typedef struct _DDHAL_GETMOCOMPGUIDSDATA FAR *LPDDHAL_GETMOCOMPGUIDSDATA;
 typedef struct _DDHAL_GETMOCOMPFORMATSDATA FAR *LPDDHAL_GETMOCOMPFORMATSDATA;
diff --git a/reactos/w32api/include/ddk/ddrawint.h b/reactos/w32api/include/ddk/ddrawint.h
index 6348600c0c3..f038adf4149 100644
--- a/reactos/w32api/include/ddk/ddrawint.h
+++ b/reactos/w32api/include/ddk/ddrawint.h
@@ -5,8 +5,20 @@
 #ifndef __DD_INCLUDED__
 #define __DD_INCLUDED__
 
+#ifndef _NO_DDRAWINT_NO_COM
+#ifndef _NO_COM
+#define _NO_COM
 #include <ddraw.h>
-#include <ddk/ddrawi.h>
+#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */
+#undef _NO_COM
+#else
+#include <ddraw.h>
+#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */
+#endif
+#else
+#include <ddraw.h>
+#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/reactos/w32api/include/ddraw.h b/reactos/w32api/include/ddraw.h
index 18ed5620c31..546db9150ea 100644
--- a/reactos/w32api/include/ddraw.h
+++ b/reactos/w32api/include/ddraw.h
@@ -43,7 +43,9 @@
 #ifndef __WINE_DDRAW_H
 #define __WINE_DDRAW_H
 
+#ifndef _NO_COM
 #include <objbase.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,6 +58,7 @@ extern "C" {
 /*****************************************************************************
  * Predeclare the interfaces
  */
+#ifndef _NO_COM
 #ifndef __DDRAW_GUID_DEFINED__
 DEFINE_GUID( CLSID_DirectDraw,		0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35 );
 DEFINE_GUID( CLSID_DirectDraw7,         0x3C305196,0x50DB,0x11D3,0x9C,0xFE,0x00,0xC0,0x4F,0xD9,0x30,0xC5 );
@@ -74,6 +77,7 @@ DEFINE_GUID( IID_IDirectDrawClipper,	0x6C14DB85,0xA733,0x11CE,0xA5,0x21,0x00,0x2
 DEFINE_GUID( IID_IDirectDrawColorControl,0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8 );
 DEFINE_GUID( IID_IDirectDrawGammaControl,0x69C11C3E,0xB46B,0x11D1,0xAD,0x7A,0x00,0xC0,0x4F,0xC2,0x9B,0x4E );
 #endif
+#endif
 
 typedef struct IDirectDraw *LPDIRECTDRAW;
 typedef struct IDirectDraw2 *LPDIRECTDRAW2;
@@ -1069,16 +1073,17 @@ typedef struct {
 	WORD	blue[256];
 } DDGAMMARAMP,*LPDDGAMMARAMP;
 
-typedef BOOL (CALLBACK *LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
-typedef BOOL (CALLBACK *LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
-DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
-
 typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
 typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID);
 typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
 typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID);
 typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK7)(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2, LPVOID);
 
+#ifndef _NO_COM
+typedef BOOL (CALLBACK *LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
+typedef BOOL (CALLBACK *LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
+DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
+
 typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
 typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
 DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
@@ -1090,6 +1095,7 @@ HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lp
 typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXA)( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
 typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXW)( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
 DECL_WINELIB_TYPE_AW(LPDIRECTDRAWENUMERATEEX)
+#endif /* _NO_COM */
 
 /* flags for DirectDrawEnumerateEx */
 #define DDENUM_ATTACHEDSECONDARYDEVICES	0x00000001
@@ -1229,6 +1235,7 @@ typedef struct tagDDDEVICEIDENTIFIER2 {
   DWORD   dwWHQLLevel;				/* Windows Hardware Quality Lab certification level */
 } DDDEVICEIDENTIFIER2, * LPDDDEVICEIDENTIFIER2;
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDrawPalette interface
  */
@@ -1268,8 +1275,10 @@ DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown)
 #define IDirectDrawPalette_Initialize(p,a,b,c)   (p)->Initialize(a,b,c)
 #define IDirectDrawPalette_SetEntries(p,a,b,c,d) (p)->SetEntries(a,b,c,d)
 #endif
+#endif /* _NO_COM */
 
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDrawClipper interface
  */
@@ -1315,8 +1324,10 @@ DECLARE_INTERFACE_(IDirectDrawClipper,IUnknown)
 #define IDirectDrawClipper_SetClipList(p,a,b)     (p)->SetClipList(a,b)
 #define IDirectDrawClipper_SetHWnd(p,a,b)         (p)->SetHWnd(a,b)
 #endif
+#endif /* _NO_COM */
 
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDraw interface
  */
@@ -1404,6 +1415,7 @@ DECLARE_INTERFACE_(IDirectDraw,IUnknown)
 #define IDirectDraw_SetDisplayMode(p,a,b,c)     (p)->SetDisplayMode(a,b,c)
 #define IDirectDraw_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
 #endif
+#endif /* _NO_COM */
 
 
 /* flags for Lock() */
@@ -1417,6 +1429,7 @@ DECLARE_INTERFACE_(IDirectDraw,IUnknown)
 #define DDLOCK_DISCARDCONTENTS  0x00002000
 
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDraw2 interface
  */
@@ -1513,8 +1526,10 @@ DECLARE_INTERFACE_(IDirectDraw2,IUnknown)
 /*** IDirectDraw2 methods ***/
 #define IDirectDraw2_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c)
 #endif
+#endif /* _NO_COM */
 
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDraw4 interface
  */
@@ -1623,8 +1638,10 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown)
 #define IDirectDraw4_TestCooperativeLevel(p)    (p)->TestCooperativeLevel()
 #define IDirectDraw4_GetDeviceIdentifier(p,a,b) (p)->GetDeviceIdentifier(a,b)
 #endif
+#endif /* _NO_COM */
 
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDraw7 interface
  */
@@ -1745,8 +1762,10 @@ DECLARE_INTERFACE_(IDirectDraw7,IUnknown)
 #define IDirectDraw7_StartModeTest(p,a,b,c)     (p)->StartModeTest(a,b,c)
 #define IDirectDraw7_EvaluateMode(p,a,b)        (p)->EvaluateMode(a,b)
 #endif
+#endif /* _NO_COM */
 
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDrawSurface interface
  */
@@ -1873,8 +1892,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown)
 #define IDirectDrawSurface_UpdateOverlayDisplay(p,a)    (p)->UpdateOverlayDisplay(a)
 #define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b)   (p)->UpdateOverlayZOrder(a,b)
 #endif
+#endif /* _NO_COM */
 
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDrawSurface2 interface
  */
@@ -2016,8 +2037,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown)
 #define IDirectDrawSurface2_PageLock(p,a)       (p)->PageLock(a)
 #define IDirectDrawSurface2_PageUnlock(p,a)     (p)->PageUnlock(a)
 #endif
+#endif /* _NO_COM */
 
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDrawSurface3 interface
  */
@@ -2165,8 +2188,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown)
 /*** IDirectDrawSurface3 methods ***/
 #define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) (p)->SetSurfaceDesc(a,b)
 #endif
+#endif /* _NO_COM */
 
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDrawSurface4 interface
  */
@@ -2331,8 +2356,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown)
 #define IDirectDrawSurface4_GetUniquenessValue(p,a)   (p)->GetUniquenessValue(a)
 #define IDirectDrawSurface4_ChangeUniquenessValue(p)  (p)->ChangeUniquenessValue()
 #endif
+#endif /* _NO_COM */
 
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDrawSurface7 interface
  */
@@ -2510,7 +2537,9 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown)
 #define IDirectDrawSurface7_SetLOD(p,a)               (p)->SetLOD(a)
 #define IDirectDrawSurface7_GetLOD(p,a)               (p)->GetLOD(a)
 #endif
+#endif /* _NO_COM */
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDrawColorControl interface
  */
@@ -2544,7 +2573,9 @@ DECLARE_INTERFACE_(IDirectDrawColorControl,IUnknown)
 #define IDirectDrawColorControl_GetColorControls(p,a) (p)->GetColorControls(a)
 #define IDirectDrawColorControl_SetColorControls(p,a) (p)->SetColorControls(a)
 #endif
+#endif /* _NO_COM */
 
+#ifndef _NO_COM
 /*****************************************************************************
  * IDirectDrawGammaControl interface
  */
@@ -2578,14 +2609,16 @@ DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown)
 #define IDirectDrawGammaControl_GetGammaRamp(p,a,b)   (p)->GetGammaRamp(a,b)
 #define IDirectDrawGammaControl_SetGammaRamp(p,a,b)   (p)->SetGammaRamp(a,b)
 #endif
+#endif /* _NO_COM */
 
-
+#ifndef _NO_COM
 HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN);
 HRESULT WINAPI DirectDrawCreateEx(LPGUID,LPVOID*,REFIID,LPUNKNOWN);
 HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
 HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
 #define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
 HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN);
+#endif /* _NO_COM */
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/reactos/w32api/include/oleacc.h b/reactos/w32api/include/oleacc.h
index af5d813ac13..3d1b9384259 100644
--- a/reactos/w32api/include/oleacc.h
+++ b/reactos/w32api/include/oleacc.h
@@ -101,6 +101,7 @@ extern "C" {
 #define ROLE_SYSTEM_WHITESPACE 59
 #define ROLE_SYSTEM_WINDOW 9
 
+#ifndef STATE_SYSTEM_UNAVAILABLE
 #define STATE_SYSTEM_UNAVAILABLE 0x00000001
 #define STATE_SYSTEM_SELECTED 0x00000002
 #define STATE_SYSTEM_FOCUSED 0x00000004
@@ -131,6 +132,7 @@ extern "C" {
 #define STATE_SYSTEM_ALERT_MEDIUM 0x08000000
 #define STATE_SYSTEM_ALERT_HIGH 0x10000000
 #define STATE_SYSTEM_VALID 0x1fffffff
+#endif
 
 typedef enum tagSELFLAG
 {
diff --git a/reactos/w32api/include/winuser.h b/reactos/w32api/include/winuser.h
index 7246baf3869..fbd65454b4e 100644
--- a/reactos/w32api/include/winuser.h
+++ b/reactos/w32api/include/winuser.h
@@ -2414,6 +2414,36 @@ extern "C" {
 #define RIDEV_NOHOTKEYS    0x00000200
 #define RIDEV_APPKEYS      0x00000400
 #endif
+#define STATE_SYSTEM_UNAVAILABLE 0x00000001
+#define STATE_SYSTEM_SELECTED 0x00000002
+#define STATE_SYSTEM_FOCUSED 0x00000004
+#define STATE_SYSTEM_PRESSED 0x00000008
+#define STATE_SYSTEM_CHECKED 0x00000010
+#define STATE_SYSTEM_MIXED 0x00000020
+#define STATE_SYSTEM_READONLY 0x00000040
+#define STATE_SYSTEM_HOTTRACKED 0x00000080
+#define STATE_SYSTEM_DEFAULT 0x00000100
+#define STATE_SYSTEM_EXPANDED 0x00000200
+#define STATE_SYSTEM_COLLAPSED 0x00000400
+#define STATE_SYSTEM_BUSY 0x00000800
+#define STATE_SYSTEM_FLOATING 0x00001000
+#define STATE_SYSTEM_MARQUEED 0x00002000
+#define STATE_SYSTEM_ANIMATED 0x00004000
+#define STATE_SYSTEM_INVISIBLE 0x00008000
+#define STATE_SYSTEM_OFFSCREEN 0x00010000
+#define STATE_SYSTEM_SIZEABLE 0x00020000
+#define STATE_SYSTEM_MOVEABLE 0x00040000
+#define STATE_SYSTEM_SELFVOICING 0x00080000
+#define STATE_SYSTEM_FOCUSABLE 0x00100000
+#define STATE_SYSTEM_SELECTABLE 0x00200000
+#define STATE_SYSTEM_LINKED 0x00400000
+#define STATE_SYSTEM_TRAVERSED 0x00800000
+#define STATE_SYSTEM_MULTISELECTABLE 0x01000000
+#define STATE_SYSTEM_EXTSELECTABLE 0x02000000
+#define STATE_SYSTEM_ALERT_LOW 0x04000000
+#define STATE_SYSTEM_ALERT_MEDIUM 0x08000000
+#define STATE_SYSTEM_ALERT_HIGH 0x10000000
+#define STATE_SYSTEM_VALID 0x1fffffff
 
 #ifndef RC_INVOKED
 typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);