diff --git a/reactos/include/host/poppack.h b/reactos/include/host/poppack.h
new file mode 100644
index 00000000000..a59ce8d9848
--- /dev/null
+++ b/reactos/include/host/poppack.h
@@ -0,0 +1,10 @@
+#ifndef RC_INVOKED
+#if ( _MSC_VER >= 800 )
+#pragma warning(disable:4103)
+#endif // _MSC_VER
+# if ( __FreeBSD__ == 5 )
+#  pragma pack(4)
+# else
+#  pragma pack(pop)
+# endif // __FreeBSD__
+#endif // RC_INVOKED
diff --git a/reactos/include/host/pshpack1.h b/reactos/include/host/pshpack1.h
new file mode 100644
index 00000000000..278e728d000
--- /dev/null
+++ b/reactos/include/host/pshpack1.h
@@ -0,0 +1,10 @@
+#ifndef RC_INVOKED
+#if ( _MSC_VER >= 800 )
+#pragma warning(disable:4103)
+#endif // _MSC_VER
+# if ( __FreeBSD__ == 5 )
+#  pragma pack(1)
+# else
+#  pragma pack(push,1)
+# endif // __FreeBSD__
+#endif // RC_INVOKED
diff --git a/reactos/include/host/pshpack2.h b/reactos/include/host/pshpack2.h
new file mode 100644
index 00000000000..0e3038cc7c6
--- /dev/null
+++ b/reactos/include/host/pshpack2.h
@@ -0,0 +1,10 @@
+#ifndef RC_INVOKED
+#if ( _MSC_VER >= 800 )
+#pragma warning(disable:4103)
+#endif // _MSC_VER
+# if ( __FreeBSD__ == 5 )
+#  pragma pack(2)
+# else
+#  pragma pack(push,2)
+# endif // __FreeBSD__
+#endif // RC_INVOKED
diff --git a/reactos/include/host/pshpack4.h b/reactos/include/host/pshpack4.h
new file mode 100644
index 00000000000..cba005cd358
--- /dev/null
+++ b/reactos/include/host/pshpack4.h
@@ -0,0 +1,10 @@
+#ifndef RC_INVOKED
+#if ( _MSC_VER >= 800 )
+#pragma warning(disable:4103)
+#endif // _MSC_VER
+# if ( __FreeBSD__ == 5 )
+#  pragma pack(4)
+# else
+#  pragma pack(push,4)
+# endif // __FreeBSD__
+#endif // RC_INVOKED
diff --git a/reactos/include/host/pshpack8.h b/reactos/include/host/pshpack8.h
new file mode 100644
index 00000000000..8ca507f1ca1
--- /dev/null
+++ b/reactos/include/host/pshpack8.h
@@ -0,0 +1,10 @@
+#ifndef RC_INVOKED
+#if ( _MSC_VER >= 800 )
+#pragma warning(disable:4103)
+#endif // _MSC_VER
+# if ( __FreeBSD__ == 5 )
+#  pragma pack(8)
+# else
+#  pragma pack(push,8)
+# endif // __FreeBSD__
+#endif // RC_INVOKED
diff --git a/reactos/include/host/pshpck16.h b/reactos/include/host/pshpck16.h
new file mode 100644
index 00000000000..83d3329c413
--- /dev/null
+++ b/reactos/include/host/pshpck16.h
@@ -0,0 +1,10 @@
+#ifndef RC_INVOKED
+#if ( _MSC_VER >= 800 )
+#pragma warning(disable:4103)
+#endif // _MSC_VER
+# if ( __FreeBSD__ == 5 )
+#  pragma pack(16)
+# else
+#  pragma pack(push,16)
+# endif // __FreeBSD__
+#endif // RC_INVOKED
diff --git a/reactos/include/reactos/typedefs_host.h b/reactos/include/host/typedefs.h
similarity index 98%
rename from reactos/include/reactos/typedefs_host.h
rename to reactos/include/host/typedefs.h
index b457ceb8b9a..71addb42088 100644
--- a/reactos/include/reactos/typedefs_host.h
+++ b/reactos/include/host/typedefs.h
@@ -1,7 +1,7 @@
 /*
   PROJECT:    ReactOS
   LICENSE:    GPL v2 or any later version
-  FILE:       include/reactos/typedefs_host.h
+  FILE:       include/host/typedefs.h
   PURPOSE:    Type definitions and useful macros for host tools
   COPYRIGHT:  Copyright 2007 Hervé Poussineau
 */
diff --git a/reactos/lib/cmlib/cmlib.h b/reactos/lib/cmlib/cmlib.h
index 0a89b8e2619..9e86c926418 100644
--- a/reactos/lib/cmlib/cmlib.h
+++ b/reactos/lib/cmlib/cmlib.h
@@ -9,10 +9,20 @@
 #define CMLIB_H
 
 #ifdef CMLIB_HOST
-#include <typedefs_host.h>
+#include <host/typedefs.h>
 #include <stdio.h>
 #include <string.h>
-#include <ntstatus.h>
+
+// Definitions copied from <ntstatus.h>
+// We only want to include host headers, so we define them manually
+#define STATUS_SUCCESS                   ((NTSTATUS)0x00000000)
+#define STATUS_NOT_IMPLEMENTED           ((NTSTATUS)0xC0000002)
+#define STATUS_NO_MEMORY                 ((NTSTATUS)0xC0000017)
+#define STATUS_INSUFFICIENT_RESOURCES    ((NTSTATUS)0xC000009A)
+#define STATUS_REGISTRY_CORRUPT          ((NTSTATUS)0xC000014C)
+#define STATUS_NOT_REGISTRY_FILE         ((NTSTATUS)0xC000015C)
+#define STATUS_REGISTRY_RECOVERED        ((NTSTATUS)0x40000009)
+
 #endif
 
 #ifndef _TYPEDEFS_HOST_H
diff --git a/reactos/lib/cmlib/cmlib.mak b/reactos/lib/cmlib/cmlib.mak
index fb09170aed1..8ef21f050b2 100644
--- a/reactos/lib/cmlib/cmlib.mak
+++ b/reactos/lib/cmlib/cmlib.mak
@@ -31,7 +31,7 @@ CMLIB_HOST_OBJECTS = \
 	$(subst $(CMLIB_BASE), $(CMLIB_INT), $(CMLIB_HOST_SOURCES:.c=.o))
 
 CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \
-  -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk \
+  -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude \
   -DCMLIB_HOST
 
 $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT)
diff --git a/reactos/lib/inflib/builddep.h b/reactos/lib/inflib/builddep.h
index 8100b373448..ac39869df81 100644
--- a/reactos/lib/inflib/builddep.h
+++ b/reactos/lib/inflib/builddep.h
@@ -8,7 +8,7 @@
 
 /* Definitions native to the host on which we're building */
 
-#include <typedefs_host.h>
+#include <host/typedefs.h>
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/reactos/lib/inflib/inflib.mak b/reactos/lib/inflib/inflib.mak
index abb95175c84..56860e90f6e 100755
--- a/reactos/lib/inflib/inflib.mak
+++ b/reactos/lib/inflib/inflib.mak
@@ -32,7 +32,7 @@ INFLIB_HOST_OBJECTS = \
 
 INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \
   -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \
-  -Iinclude/reactos -Iinclude/psdk
+  -Iinclude/reactos -Iinclude
 
 $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT)
 	$(ECHO_AR)
diff --git a/reactos/tools/mkhive/mkhive.h b/reactos/tools/mkhive/mkhive.h
index 0609765ac95..e683ee9117c 100644
--- a/reactos/tools/mkhive/mkhive.h
+++ b/reactos/tools/mkhive/mkhive.h
@@ -30,8 +30,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <typedefs_host.h>
-#include <ntstatus.h>
+#include <host/typedefs.h>
+
+// Definitions copied from <ntstatus.h>
+// We only want to include host headers, so we define them manually
+#define STATUS_SUCCESS                   ((NTSTATUS)0x00000000)
+#define STATUS_UNSUCCESSFUL              ((NTSTATUS)0xC0000001)
+#define STATUS_NOT_IMPLEMENTED           ((NTSTATUS)0xC0000002)
+#define STATUS_INVALID_PARAMETER         ((NTSTATUS)0xC000000D)
+#define STATUS_NO_MEMORY                 ((NTSTATUS)0xC0000017)
+#define STATUS_INSUFFICIENT_RESOURCES    ((NTSTATUS)0xC000009A)
+#define STATUS_OBJECT_NAME_NOT_FOUND     ((NTSTATUS)0xC0000034)
+#define STATUS_INVALID_PARAMETER_2       ((NTSTATUS)0xC00000F0)
+#define STATUS_BUFFER_OVERFLOW           ((NTSTATUS)0x80000005)
 
 NTSTATUS NTAPI
 RtlAnsiStringToUnicodeString(
diff --git a/reactos/tools/mkhive/mkhive.mak b/reactos/tools/mkhive/mkhive.mak
index d8909545270..8c9c716fa9d 100644
--- a/reactos/tools/mkhive/mkhive.mak
+++ b/reactos/tools/mkhive/mkhive.mak
@@ -31,7 +31,7 @@ MKHIVE_OBJECTS = \
 	$(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o))
 
 MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \
-  -DMKHIVE_HOST -Iinclude/reactos -Iinclude/psdk -g3
+  -DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3
 
 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3
 
diff --git a/reactos/tools/unicode/unicode.mak b/reactos/tools/unicode/unicode.mak
index 1741216ebea..50cf8b9abba 100644
--- a/reactos/tools/unicode/unicode.mak
+++ b/reactos/tools/unicode/unicode.mak
@@ -96,7 +96,7 @@ UNICODE_OBJECTS = \
 
 UNICODE_HOST_CFLAGS = \
 	-D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \
-	-I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/psdk -Iinclude/reactos \
+	-I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/reactos \
 	$(TOOLS_CFLAGS)
 
 .PHONY: unicode
diff --git a/reactos/tools/unicode/wine/unicode.h b/reactos/tools/unicode/wine/unicode.h
index 68c18dab998..f5d6f4dc9ca 100644
--- a/reactos/tools/unicode/wine/unicode.h
+++ b/reactos/tools/unicode/wine/unicode.h
@@ -22,7 +22,7 @@
 #define __WINE_UNICODE_H
 
 #include <stdarg.h>
-#include <typedefs_host.h>
+#include <host/typedefs.h>
 
 // Definitions copied from <winnls.h>
 // We only want to include host headers, so we define them manually
diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak
index 9eb5e5af1a2..ec846c5bb1d 100644
--- a/reactos/tools/wmc/wmc.mak
+++ b/reactos/tools/wmc/wmc.mak
@@ -34,7 +34,7 @@ WMC_OBJECTS = \
 
 WMC_HOST_CFLAGS = -I$(WMC_BASE) $(TOOLS_CFLAGS) \
                   -D__USE_W32API -DWINE_UNICODE_API= -I$(UNICODE_BASE) \
-                  -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \
+                  -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \
                   -I$(INTERMEDIATE_)/include
 
 WMC_HOST_LFLAGS = $(TOOLS_LFLAGS)
diff --git a/reactos/tools/wmc/wmctypes.h b/reactos/tools/wmc/wmctypes.h
index 28787ca93ad..83a15dd948a 100644
--- a/reactos/tools/wmc/wmctypes.h
+++ b/reactos/tools/wmc/wmctypes.h
@@ -22,7 +22,7 @@
 #define __WMC_WMCTYPES_H
 
 #include <stdarg.h>
-#include <typedefs_host.h>
+#include <host/typedefs.h>
 
 /* Byteordering defines */
 #define WMC_BO_NATIVE	0x00
diff --git a/reactos/tools/wrc/wrc.mak b/reactos/tools/wrc/wrc.mak
index 54b8cfb7c36..2b520dc0b86 100644
--- a/reactos/tools/wrc/wrc.mak
+++ b/reactos/tools/wrc/wrc.mak
@@ -57,7 +57,7 @@ WRC_OBJECTS = \
 WRC_HOST_CFLAGS = -I$(WRC_BASE) $(TOOLS_CFLAGS) \
                   -D__USE_W32API -DWINE_UNICODE_API= \
                   -I$(UNICODE_BASE) -I$(WPP_BASE) \
-                  -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \
+                  -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \
                   -I$(INTERMEDIATE_)include
 
 WRC_HOST_LFLAGS = $(TOOLS_LFLAGS)
diff --git a/reactos/tools/wrc/wrcrostypes.h b/reactos/tools/wrc/wrcrostypes.h
index 44333bb2161..c7deb49de10 100644
--- a/reactos/tools/wrc/wrcrostypes.h
+++ b/reactos/tools/wrc/wrcrostypes.h
@@ -9,7 +9,7 @@
 #ifndef _WRC_ROSTYPES_H
 #define _WRC_ROSTYPES_H
 
-#include <typedefs_host.h>
+#include <host/typedefs.h>
 #include <string.h>
 
 // Definitions copied from various <win....h> files
@@ -159,7 +159,7 @@
 #define SUBLANG_SERBIAN_CYRILLIC   0x03
 #define SUBLANG_UZBEK_CYRILLIC   0x02
 
-#include <pshpack2.h>
+#include <host/pshpack2.h>
 typedef struct tagBITMAPFILEHEADER {
    WORD   bfType;
    DWORD  bfSize;
@@ -167,7 +167,7 @@ typedef struct tagBITMAPFILEHEADER {
    WORD   bfReserved2;
    DWORD  bfOffBits;
 } BITMAPFILEHEADER,*LPBITMAPFILEHEADER,*PBITMAPFILEHEADER;
-#include <poppack.h>
+#include <host/poppack.h>
 
 typedef int FXPT2DOT30;
 typedef struct tagCIEXYZ {