diff --git a/reactos/lib/rpcrt4/Makefile b/reactos/lib/rpcrt4/Makefile
index 5ff16c5bd1f..3d4d0b3ed88 100644
--- a/reactos/lib/rpcrt4/Makefile
+++ b/reactos/lib/rpcrt4/Makefile
@@ -7,8 +7,33 @@ TARGET_NAME = rpcrt4
 
 TARGET_BASE=0x76380000
 
-# require os code to explicitly request A/W version of structs/functions
-TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API
+TARGET_CFLAGS = \
+ -Wall \
+ -fno-builtin
+
+# Compile definitions usage:
+#    __USE_W32API - Compilation with w32api headers
+#    __REACTOS__ - Compilation of Wine sources for ReactOS
+#    _WIN32_IE=0x600 - Internet Explorer 6 compatible defintions
+#    WINVER=0x501 - Windows XP definitions
+#    __need_offsetof - Force definition of macro offsetof in stddef.h
+#
+DEFINES = \
+	-D_DISABLE_TIDENTS \
+	-D__USE_W32API \
+	-D__REACTOS__ \
+	-D_WIN32_IE=0x600 \
+	-D_WIN32_WINNT=0x501 \
+	-DWINVER=0x501 \
+	-DCOBJMACROS \
+	-D__need_offsetof
+	
+TARGET_CFLAGS += \
+	$(DEFINES) \
+	-DDCX_USESTYLE=0x10000L \
+	-I$(PATH_TO_TOP)/include/wine
+
+TARGET_RCFLAGS += -D__REACTOS__	-D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501
 
 TARGET_SDKLIBS = ntdll.a winedbgc.a
 
diff --git a/reactos/lib/rpcrt4/rpcrt4_main.c b/reactos/lib/rpcrt4/rpcrt4_main.c
index e1f56fc727a..6b2ef9f153a 100644
--- a/reactos/lib/rpcrt4/rpcrt4_main.c
+++ b/reactos/lib/rpcrt4/rpcrt4_main.c
@@ -1,8 +1,9 @@
 /*
- *  RPCRT4
- *
+ * ReactOS - RPCRT4
  * Copyright 2000 Huw D M Davies for Codeweavers
  *
+ * Gettimeofday - Copyright Wu Yongwei
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -16,15 +17,18 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES: (sedwards) 
+ * Dont use this for anything major in ReactOS. Its only here
+ * to make dll dependancys happy and for the UUIDCreate Function.
  * 
+ * If you wish to work on rpcrt4 in ReactOS please look at the current winehq
+ * sources and figure out a way to implement a IPC/LPC bridge so we dont have
+ * for this code from WINE.
+ *
+ * throw the code out and start over. =)
  */
 
-#include "wine/config.h"
-#include "wine/port.h"
-#include "wine/debug.h"
-
-#define _TIMEVAL_DEFINED // ReactOS
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -66,6 +70,10 @@
 # include <netinet/in.h>
 #endif
 
+#include "wine/config.h"
+#include "wine/port.h"
+#include "wine/debug.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 static UUID uuid_nil;
@@ -234,8 +242,6 @@ RPC_STATUS WINAPI UuidCreateNil(UUID *Uuid)
 
  /*************************************************************************
  * gettimeofday for systems that lack it
- *
- * By Wu Yongwei
  */
 
 #ifndef __GNUC__