diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h
index 6bc1a7fcab0..3b821de888d 100644
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@ -120,6 +120,8 @@ typedef void* __ptr64 PVOID64;
 
 #ifndef _WCHAR_T_DEFINED
 #define _WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DECLARED      /* for FreeBSD 5 and later */
+#define _WCHAR_T_DECLARED
 #ifndef _WCHAR_T_
 #define _WCHAR_T_
 #undef __need_wchar_t
@@ -128,6 +130,7 @@ typedef unsigned short wchar_t;
 #endif
 #endif
 #endif
+#endif
 
 #ifdef __cplusplus
 # define EXTERN_C    extern "C"
@@ -1841,7 +1844,7 @@ typedef struct _ACL_SIZE_INFORMATION {
 } ACL_SIZE_INFORMATION;
 
 /* FIXME: add more machines */
-#if defined(_X86_) || defined(linux)
+#if defined(_X86_) || defined(unix)
 #define SIZE_OF_80387_REGISTERS	80
 #define CONTEXT_i386	0x10000
 #define CONTEXT_i486	0x10000
diff --git a/reactos/tools/rsym.h b/reactos/tools/rsym.h
index b9346058f61..ae5dc39df44 100644
--- a/reactos/tools/rsym.h
+++ b/reactos/tools/rsym.h
@@ -14,7 +14,7 @@ typedef unsigned char BYTE;
 typedef unsigned char UCHAR;
 typedef unsigned short WORD;
 typedef unsigned short USHORT;
-#if defined(__x86_64__) && defined(linux)
+#if defined(__x86_64__) && defined(unix)
 typedef signed int LONG;
 typedef unsigned int ULONG;
 typedef unsigned int DWORD;
@@ -26,7 +26,7 @@ typedef unsigned long DWORD;
 #if defined(_WIN64)
 typedef unsigned __int64 ULONG_PTR;
 #else
-#if defined(__x86_64__) && defined(linux)
+#if defined(__x86_64__) && defined(unix)
 typedef  unsigned int  ULONG_PTR;
 #else
 typedef  unsigned long ULONG_PTR;
diff --git a/reactos/tools/wrc/genres.c b/reactos/tools/wrc/genres.c
index a333c184bad..aacfbee61da 100644
--- a/reactos/tools/wrc/genres.c
+++ b/reactos/tools/wrc/genres.c
@@ -44,7 +44,7 @@
 #include "wine/unicode.h"
 
 /* Fix 64-bit host, re: put_dword */
-#if defined(linux) && defined(__x86_64__)
+#if defined(unix) && defined(__x86_64__)
 typedef unsigned int HOST_DWORD;
 #else
 typedef unsigned long HOST_DWORD;