diff --git a/reactos/include/base.h b/reactos/include/base.h
index 91b43bb9956..e8b39f44355 100644
--- a/reactos/include/base.h
+++ b/reactos/include/base.h
@@ -63,8 +63,8 @@ typedef long LONG;
    
 
 #ifdef UNICODE
-typedef unsigned short *LPTCH;
-typedef unsigned short *LPTSTR;
+typedef wchar_t *LPTCH;
+typedef wchar_t *LPTSTR;
 #else
 typedef char *LPTCH;
 typedef char *LPTSTR;
@@ -154,12 +154,12 @@ typedef CHAR *LPCH;
 typedef COLORREF *LPCOLORREF;
    
 #ifdef UNICODE
-typedef const unsigned short *LPCTSTR;
+typedef const wchar_t *LPCTSTR;
 #else
 typedef const char *LPCTSTR;
 #endif /* UNICODE */
 
-typedef const unsigned short *LPCWCH;
+typedef const wchar_t *LPCWCH;
 typedef DWORD *LPDWORD;
 /* typedef LPFRHOOKPROC; */
 typedef HANDLE *LPHANDLE;
@@ -168,14 +168,14 @@ typedef PINT LPINT;
 typedef PLONG LPLONG;
 
 typedef long LRESULT;
-typedef unsigned short *LPWCH;
+typedef wchar_t *LPWCH;
 typedef unsigned short *LPWORD;
 /* typedef NPSTR; */
-typedef unsigned short *NWPSTR;
+typedef wchar_t *NWPSTR;
 typedef WINBOOL *PWINBOOL;
 typedef const CHAR *PCCH;
 typedef const char *PCSTR;
-typedef const unsigned short *PCWCH;
+typedef const wchar_t *PCWCH;
 /* typedef PHKEY; */
 /* typedef LCID *PLCID; */
 typedef short *PSHORT;
@@ -184,10 +184,10 @@ typedef char *PSTR;
 typedef char *PSZ;
 
 #ifdef UNICODE
-typedef unsigned short *PTBYTE;
-typedef unsigned short *PTCH;
-typedef unsigned short *PTCHAR;
-typedef unsigned short *PTSTR;
+typedef wchar_t *PTBYTE;
+typedef wchar_t *PTCH;
+typedef wchar_t *PTCHAR;
+typedef wchar_t *PTSTR;
 #else
 typedef unsigned char *PTBYTE;
 typedef char *PTCH;
@@ -210,12 +210,12 @@ typedef DWORD SERVICE_STATUS_HANDLE;
 /* typedef SPHANDLE; */
 
 #ifdef UNICODE
-typedef unsigned short TBYTE;
+typedef wchar_t TBYTE;
 #ifndef _TCHAR_DEFINED
 #define _TCHAR_DEFINED
-typedef unsigned short TCHAR;
+typedef wchar_t TCHAR;
 #endif /* _TCHAR_DEFINED */
-typedef unsigned short BCHAR;
+typedef wchar_t BCHAR;
 #else
 typedef unsigned char TBYTE;
 #ifndef _TCHAR_DEFINED
@@ -348,12 +348,21 @@ typedef enum _SID_NAME_USE {
 #define INDEXTOSTATEIMAGEMASK(i) ((i) << 12)  
 
 #ifdef UNICODE
+#ifndef _T
 #define _T(quote)   L##quote 
+#endif
+#ifndef _TEXT
 #define TEXT(quote) L##quote 
+#endif
 #else
+#ifndef _T
 #define _T(quote)   quote 
+#endif
+#ifndef _TEXT
 #define TEXT(quote) quote
 #endif
+#endif
+
 
 #ifndef RC_INVOKED
 
@@ -370,7 +379,7 @@ typedef UINT CALLBACK (*LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
 typedef UINT CALLBACK (*LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
 typedef WINBOOL CALLBACK (*DLGPROC) (HWND, UINT, WPARAM, LPARAM);
 typedef int CALLBACK (*PFNPROPSHEETCALLBACK) (HWND, UINT, LPARAM);
-typedef VOID CALLBACK (*LPSERVICE_MAIN_FUNCTION) (DWORD, LPTSTR);
+typedef VOID CALLBACK (*LPSERVICE_MAIN_FUNCTION) (DWORD, LPTSTR*);
 typedef int CALLBACK (*PFNTVCOMPARE) (LPARAM, LPARAM, LPARAM);
 typedef LRESULT CALLBACK (*WNDPROC) (HWND, UINT, WPARAM, LPARAM);
 typedef int CALLBACK (*FARPROC)(void);
diff --git a/reactos/include/errors.h b/reactos/include/errors.h
index fbb40233b2d..30a219bcaf3 100644
--- a/reactos/include/errors.h
+++ b/reactos/include/errors.h
@@ -58,6 +58,10 @@ extern "C" {
 #define LZERROR_BADOUTHANDLE           (-2)
 #define LZERROR_BADINHANDLE            (-1)
 #define NO_ERROR                         0L
+
+#if 0
+#include "../reactos/errcodes.h"
+#else
 #define ERROR_SUCCESS                    0L
 #define ERROR_INVALID_FUNCTION           1L
 #define ERROR_FILE_NOT_FOUND             2L
@@ -724,6 +728,7 @@ extern "C" {
 #define ERROR_REC_NON_EXISTENT           4005L
 #define ERROR_RPL_NOT_ALLOWED            4006L
 #define ERROR_NO_BROWSER_SERVERS_FOUND   6118L
+#endif
 
 
 /* HRESULT values for OLE, SHELL and other Interface stuff */
diff --git a/reactos/include/funcs.h b/reactos/include/funcs.h
index 9a3c69d78dc..3c1798b06ba 100644
--- a/reactos/include/funcs.h
+++ b/reactos/include/funcs.h
@@ -5523,7 +5523,8 @@ WINBOOL
 STDCALL
 DrawEdge(HDC hdc, LPRECT qrc, UINT edge, UINT grfFlags);
 
-WINBOOL STDCALL
+WINBOOL
+STDCALL
 DrawFrameControl(HDC, LPRECT, UINT, UINT);
 
 WINBOOL
diff --git a/reactos/include/ntos/types.h b/reactos/include/ntos/types.h
index 7bfc1fda752..999a271051b 100644
--- a/reactos/include/ntos/types.h
+++ b/reactos/include/ntos/types.h
@@ -83,22 +83,44 @@ typedef ULONG32 ULONG, *PULONG;
 
 #endif /* _WIN64 */
 
+#ifndef _WCHAR_T_
+#define _WCHAR_T_
+#define _WCHAR_T
+#define _WCHAR_T_DEFINED
+#ifndef __WCHAR_TYPE__
+#define __WCHAR_TYPE__      short unsigned int
+#endif
+
+#ifndef __cplusplus
+typedef __WCHAR_TYPE__      wchar_t;
+#endif  /* C++ */
+
+#endif  /* wchar_t not already defined */
+
+
+//#ifndef __cplusplus
+//#ifndef _WCHAR_T_DEFINED
+//#define _WCHAR_T_DEFINED
+//typedef unsigned short wchar_t;
+//#endif
+//#endif
+
 typedef unsigned char UCHAR;
 typedef unsigned short USHORT;
-typedef unsigned short WCHAR;
+typedef wchar_t WCHAR;
 typedef unsigned short WORD;
 typedef int BOOL;
 typedef unsigned char BOOLEAN;
 typedef BOOLEAN* PBOOLEAN;
-typedef unsigned short *LPWSTR;
-typedef unsigned short *PWSTR;
+typedef wchar_t *LPWSTR;
+typedef wchar_t *PWSTR;
 typedef unsigned char *PUCHAR;
 typedef unsigned short *PUSHORT;
 typedef void *PVOID;
 typedef unsigned char BYTE;
 typedef void *LPVOID;
 typedef float *PFLOAT;
-typedef unsigned short *PWCH;
+typedef wchar_t *PWCH;
 typedef unsigned short *PWORD;
 
 #include <msvcrt/crttypes.h> // for definition of LONGLONG, PLONGLONG etc
@@ -110,17 +132,17 @@ typedef DWORD LCID;
 typedef DWORD *PLCID;
 typedef const char *LPCSTR;
 typedef char *LPSTR;
-typedef const unsigned short *LPCWSTR;
+typedef const wchar_t *LPCWSTR;
 typedef CHAR *PCHAR;
 typedef CHAR *PCH;
 typedef void *HANDLE;
 typedef HANDLE *PHANDLE;
 typedef char CCHAR;
 typedef CCHAR *PCCHAR;
-typedef unsigned short *PWCHAR;
+typedef wchar_t *PWCHAR;
 typedef ULONG WAIT_TYPE;
 typedef USHORT CSHORT;
-typedef const unsigned short *PCWSTR;
+typedef const wchar_t *PCWSTR;
 typedef char* PCSZ;
 
 #ifdef __GNUC__
diff --git a/reactos/include/tchar.h b/reactos/include/tchar.h
index 60528386497..68c45fd2889 100644
--- a/reactos/include/tchar.h
+++ b/reactos/include/tchar.h
@@ -29,9 +29,9 @@
  *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  * $Author: robd $
- * $Date: 2002/12/08 16:18:29 $
+ * $Date: 2003/01/01 06:19:37 $
  *
  */
 
@@ -61,8 +61,12 @@ typedef	wchar_t	TCHAR;
  * Enclose constant strings and literal characters in the _TEXT and _T macro to make
  * them unicode constant strings when _UNICODE is defined.
  */
+#ifndef _TEXT
 #define	_TEXT(x)	L ## x
+#endif
+#ifndef _T
 #define	_T(x)		L ## x
+#endif
 
 /*
  * Unicode functions