diff --git a/reactos/ReactOS.rbuild b/reactos/ReactOS.rbuild
index d5ab7c4b995..4117fed57a6 100644
--- a/reactos/ReactOS.rbuild
+++ b/reactos/ReactOS.rbuild
@@ -36,6 +36,7 @@
 
   <include>.</include>
   <include>include</include>
+  <include>include/psdk</include>
   <include>include/crt</include>
   <include>include/ddk</include>
   <include>include/GL</include>
diff --git a/reactos/include/DShow.h b/reactos/include/psdk/DShow.h
similarity index 100%
rename from reactos/include/DShow.h
rename to reactos/include/psdk/DShow.h
diff --git a/reactos/include/README.w32api b/reactos/include/psdk/README.w32api
similarity index 100%
rename from reactos/include/README.w32api
rename to reactos/include/psdk/README.w32api
diff --git a/reactos/include/accctrl.h b/reactos/include/psdk/accctrl.h
similarity index 100%
rename from reactos/include/accctrl.h
rename to reactos/include/psdk/accctrl.h
diff --git a/reactos/include/aclapi.h b/reactos/include/psdk/aclapi.h
similarity index 100%
rename from reactos/include/aclapi.h
rename to reactos/include/psdk/aclapi.h
diff --git a/reactos/include/aclui.h b/reactos/include/psdk/aclui.h
similarity index 100%
rename from reactos/include/aclui.h
rename to reactos/include/psdk/aclui.h
diff --git a/reactos/include/activecf.h b/reactos/include/psdk/activecf.h
similarity index 100%
rename from reactos/include/activecf.h
rename to reactos/include/psdk/activecf.h
diff --git a/reactos/include/advpub.h b/reactos/include/psdk/advpub.h
similarity index 100%
rename from reactos/include/advpub.h
rename to reactos/include/psdk/advpub.h
diff --git a/reactos/include/af_irda.h b/reactos/include/psdk/af_irda.h
similarity index 100%
rename from reactos/include/af_irda.h
rename to reactos/include/psdk/af_irda.h
diff --git a/reactos/include/afxres.h b/reactos/include/psdk/afxres.h
similarity index 100%
rename from reactos/include/afxres.h
rename to reactos/include/psdk/afxres.h
diff --git a/reactos/include/amaudio.h b/reactos/include/psdk/amaudio.h
similarity index 100%
rename from reactos/include/amaudio.h
rename to reactos/include/psdk/amaudio.h
diff --git a/reactos/include/amparse.h b/reactos/include/psdk/amparse.h
similarity index 100%
rename from reactos/include/amparse.h
rename to reactos/include/psdk/amparse.h
diff --git a/reactos/include/amvideo.h b/reactos/include/psdk/amvideo.h
similarity index 100%
rename from reactos/include/amvideo.h
rename to reactos/include/psdk/amvideo.h
diff --git a/reactos/include/appmgmt.h b/reactos/include/psdk/appmgmt.h
similarity index 100%
rename from reactos/include/appmgmt.h
rename to reactos/include/psdk/appmgmt.h
diff --git a/reactos/include/audevcod.h b/reactos/include/psdk/audevcod.h
similarity index 100%
rename from reactos/include/audevcod.h
rename to reactos/include/psdk/audevcod.h
diff --git a/reactos/include/authz.h b/reactos/include/psdk/authz.h
similarity index 100%
rename from reactos/include/authz.h
rename to reactos/include/psdk/authz.h
diff --git a/reactos/include/basetsd.h b/reactos/include/psdk/basetsd.h
similarity index 100%
rename from reactos/include/basetsd.h
rename to reactos/include/psdk/basetsd.h
diff --git a/reactos/include/basetyps.h b/reactos/include/psdk/basetyps.h
similarity index 100%
rename from reactos/include/basetyps.h
rename to reactos/include/psdk/basetyps.h
diff --git a/reactos/include/cderr.h b/reactos/include/psdk/cderr.h
similarity index 100%
rename from reactos/include/cderr.h
rename to reactos/include/psdk/cderr.h
diff --git a/reactos/include/cguid.h b/reactos/include/psdk/cguid.h
similarity index 100%
rename from reactos/include/cguid.h
rename to reactos/include/psdk/cguid.h
diff --git a/reactos/include/comcat.h b/reactos/include/psdk/comcat.h
similarity index 100%
rename from reactos/include/comcat.h
rename to reactos/include/psdk/comcat.h
diff --git a/reactos/include/commctrl.h b/reactos/include/psdk/commctrl.h
similarity index 100%
rename from reactos/include/commctrl.h
rename to reactos/include/psdk/commctrl.h
diff --git a/reactos/include/commdlg.h b/reactos/include/psdk/commdlg.h
similarity index 100%
rename from reactos/include/commdlg.h
rename to reactos/include/psdk/commdlg.h
diff --git a/reactos/include/cpl.h b/reactos/include/psdk/cpl.h
similarity index 100%
rename from reactos/include/cpl.h
rename to reactos/include/psdk/cpl.h
diff --git a/reactos/include/cplext.h b/reactos/include/psdk/cplext.h
similarity index 100%
rename from reactos/include/cplext.h
rename to reactos/include/psdk/cplext.h
diff --git a/reactos/include/custcntl.h b/reactos/include/psdk/custcntl.h
similarity index 100%
rename from reactos/include/custcntl.h
rename to reactos/include/psdk/custcntl.h
diff --git a/reactos/include/cvconst.h b/reactos/include/psdk/cvconst.h
similarity index 100%
rename from reactos/include/cvconst.h
rename to reactos/include/psdk/cvconst.h
diff --git a/reactos/include/d3d.h b/reactos/include/psdk/d3d.h
similarity index 100%
rename from reactos/include/d3d.h
rename to reactos/include/psdk/d3d.h
diff --git a/reactos/include/d3d8.h b/reactos/include/psdk/d3d8.h
similarity index 100%
rename from reactos/include/d3d8.h
rename to reactos/include/psdk/d3d8.h
diff --git a/reactos/include/d3d8caps.h b/reactos/include/psdk/d3d8caps.h
similarity index 100%
rename from reactos/include/d3d8caps.h
rename to reactos/include/psdk/d3d8caps.h
diff --git a/reactos/include/d3d8types.h b/reactos/include/psdk/d3d8types.h
similarity index 100%
rename from reactos/include/d3d8types.h
rename to reactos/include/psdk/d3d8types.h
diff --git a/reactos/include/d3d9.h b/reactos/include/psdk/d3d9.h
similarity index 100%
rename from reactos/include/d3d9.h
rename to reactos/include/psdk/d3d9.h
diff --git a/reactos/include/d3d9caps.h b/reactos/include/psdk/d3d9caps.h
similarity index 100%
rename from reactos/include/d3d9caps.h
rename to reactos/include/psdk/d3d9caps.h
diff --git a/reactos/include/d3d9types.h b/reactos/include/psdk/d3d9types.h
similarity index 100%
rename from reactos/include/d3d9types.h
rename to reactos/include/psdk/d3d9types.h
diff --git a/reactos/include/d3dcaps.h b/reactos/include/psdk/d3dcaps.h
similarity index 100%
rename from reactos/include/d3dcaps.h
rename to reactos/include/psdk/d3dcaps.h
diff --git a/reactos/include/d3drm.h b/reactos/include/psdk/d3drm.h
similarity index 100%
rename from reactos/include/d3drm.h
rename to reactos/include/psdk/d3drm.h
diff --git a/reactos/include/d3dtypes.h b/reactos/include/psdk/d3dtypes.h
similarity index 100%
rename from reactos/include/d3dtypes.h
rename to reactos/include/psdk/d3dtypes.h
diff --git a/reactos/include/d3dvec.inl b/reactos/include/psdk/d3dvec.inl
similarity index 100%
rename from reactos/include/d3dvec.inl
rename to reactos/include/psdk/d3dvec.inl
diff --git a/reactos/include/d3dx8core.h b/reactos/include/psdk/d3dx8core.h
similarity index 100%
rename from reactos/include/d3dx8core.h
rename to reactos/include/psdk/d3dx8core.h
diff --git a/reactos/include/dbghelp.h b/reactos/include/psdk/dbghelp.h
similarity index 100%
rename from reactos/include/dbghelp.h
rename to reactos/include/psdk/dbghelp.h
diff --git a/reactos/include/dbt.h b/reactos/include/psdk/dbt.h
similarity index 100%
rename from reactos/include/dbt.h
rename to reactos/include/psdk/dbt.h
diff --git a/reactos/include/dde.h b/reactos/include/psdk/dde.h
similarity index 100%
rename from reactos/include/dde.h
rename to reactos/include/psdk/dde.h
diff --git a/reactos/include/ddeml.h b/reactos/include/psdk/ddeml.h
similarity index 100%
rename from reactos/include/ddeml.h
rename to reactos/include/psdk/ddeml.h
diff --git a/reactos/include/ddraw.h b/reactos/include/psdk/ddraw.h
similarity index 100%
rename from reactos/include/ddraw.h
rename to reactos/include/psdk/ddraw.h
diff --git a/reactos/include/ddrawgdi.h b/reactos/include/psdk/ddrawgdi.h
similarity index 100%
rename from reactos/include/ddrawgdi.h
rename to reactos/include/psdk/ddrawgdi.h
diff --git a/reactos/include/devguid.h b/reactos/include/psdk/devguid.h
similarity index 100%
rename from reactos/include/devguid.h
rename to reactos/include/psdk/devguid.h
diff --git a/reactos/include/dhcpcapi.h b/reactos/include/psdk/dhcpcapi.h
similarity index 100%
rename from reactos/include/dhcpcapi.h
rename to reactos/include/psdk/dhcpcapi.h
diff --git a/reactos/include/dhcpcsdk.h b/reactos/include/psdk/dhcpcsdk.h
similarity index 100%
rename from reactos/include/dhcpcsdk.h
rename to reactos/include/psdk/dhcpcsdk.h
diff --git a/reactos/include/digitalv.h b/reactos/include/psdk/digitalv.h
similarity index 100%
rename from reactos/include/digitalv.h
rename to reactos/include/psdk/digitalv.h
diff --git a/reactos/include/dinput.h b/reactos/include/psdk/dinput.h
similarity index 100%
rename from reactos/include/dinput.h
rename to reactos/include/psdk/dinput.h
diff --git a/reactos/include/dlgs.h b/reactos/include/psdk/dlgs.h
similarity index 100%
rename from reactos/include/dlgs.h
rename to reactos/include/psdk/dlgs.h
diff --git a/reactos/include/docobj.h b/reactos/include/psdk/docobj.h
similarity index 100%
rename from reactos/include/docobj.h
rename to reactos/include/psdk/docobj.h
diff --git a/reactos/include/dplay.h b/reactos/include/psdk/dplay.h
similarity index 100%
rename from reactos/include/dplay.h
rename to reactos/include/psdk/dplay.h
diff --git a/reactos/include/dplobby.h b/reactos/include/psdk/dplobby.h
similarity index 100%
rename from reactos/include/dplobby.h
rename to reactos/include/psdk/dplobby.h
diff --git a/reactos/include/dsconf.h b/reactos/include/psdk/dsconf.h
similarity index 100%
rename from reactos/include/dsconf.h
rename to reactos/include/psdk/dsconf.h
diff --git a/reactos/include/dsdriver.h b/reactos/include/psdk/dsdriver.h
similarity index 100%
rename from reactos/include/dsdriver.h
rename to reactos/include/psdk/dsdriver.h
diff --git a/reactos/include/dsound.h b/reactos/include/psdk/dsound.h
similarity index 100%
rename from reactos/include/dsound.h
rename to reactos/include/psdk/dsound.h
diff --git a/reactos/include/dsrole.h b/reactos/include/psdk/dsrole.h
similarity index 100%
rename from reactos/include/dsrole.h
rename to reactos/include/psdk/dsrole.h
diff --git a/reactos/include/dv.h b/reactos/include/psdk/dv.h
similarity index 100%
rename from reactos/include/dv.h
rename to reactos/include/psdk/dv.h
diff --git a/reactos/include/dvdevcod.h b/reactos/include/psdk/dvdevcod.h
similarity index 100%
rename from reactos/include/dvdevcod.h
rename to reactos/include/psdk/dvdevcod.h
diff --git a/reactos/include/dxdiag.h b/reactos/include/psdk/dxdiag.h
similarity index 100%
rename from reactos/include/dxdiag.h
rename to reactos/include/psdk/dxdiag.h
diff --git a/reactos/include/dxerr8.h b/reactos/include/psdk/dxerr8.h
similarity index 100%
rename from reactos/include/dxerr8.h
rename to reactos/include/psdk/dxerr8.h
diff --git a/reactos/include/dxerr9.h b/reactos/include/psdk/dxerr9.h
similarity index 100%
rename from reactos/include/dxerr9.h
rename to reactos/include/psdk/dxerr9.h
diff --git a/reactos/include/dxsdkver.h b/reactos/include/psdk/dxsdkver.h
similarity index 100%
rename from reactos/include/dxsdkver.h
rename to reactos/include/psdk/dxsdkver.h
diff --git a/reactos/include/edevdefs.h b/reactos/include/psdk/edevdefs.h
similarity index 100%
rename from reactos/include/edevdefs.h
rename to reactos/include/psdk/edevdefs.h
diff --git a/reactos/include/errorrep.h b/reactos/include/psdk/errorrep.h
similarity index 100%
rename from reactos/include/errorrep.h
rename to reactos/include/psdk/errorrep.h
diff --git a/reactos/include/errors.h b/reactos/include/psdk/errors.h
similarity index 100%
rename from reactos/include/errors.h
rename to reactos/include/psdk/errors.h
diff --git a/reactos/include/evcode.h b/reactos/include/psdk/evcode.h
similarity index 100%
rename from reactos/include/evcode.h
rename to reactos/include/psdk/evcode.h
diff --git a/reactos/include/evntrace.h b/reactos/include/psdk/evntrace.h
similarity index 100%
rename from reactos/include/evntrace.h
rename to reactos/include/psdk/evntrace.h
diff --git a/reactos/include/exdisp.h b/reactos/include/psdk/exdisp.h
similarity index 100%
rename from reactos/include/exdisp.h
rename to reactos/include/psdk/exdisp.h
diff --git a/reactos/include/exdispid.h b/reactos/include/psdk/exdispid.h
similarity index 100%
rename from reactos/include/exdispid.h
rename to reactos/include/psdk/exdispid.h
diff --git a/reactos/include/fci.h b/reactos/include/psdk/fci.h
similarity index 100%
rename from reactos/include/fci.h
rename to reactos/include/psdk/fci.h
diff --git a/reactos/include/fdi.h b/reactos/include/psdk/fdi.h
similarity index 100%
rename from reactos/include/fdi.h
rename to reactos/include/psdk/fdi.h
diff --git a/reactos/include/gdiplus.h b/reactos/include/psdk/gdiplus.h
similarity index 100%
rename from reactos/include/gdiplus.h
rename to reactos/include/psdk/gdiplus.h
diff --git a/reactos/include/gdiplusbase.h b/reactos/include/psdk/gdiplusbase.h
similarity index 100%
rename from reactos/include/gdiplusbase.h
rename to reactos/include/psdk/gdiplusbase.h
diff --git a/reactos/include/gdiplusbrush.h b/reactos/include/psdk/gdiplusbrush.h
similarity index 100%
rename from reactos/include/gdiplusbrush.h
rename to reactos/include/psdk/gdiplusbrush.h
diff --git a/reactos/include/gdipluscolor.h b/reactos/include/psdk/gdipluscolor.h
similarity index 100%
rename from reactos/include/gdipluscolor.h
rename to reactos/include/psdk/gdipluscolor.h
diff --git a/reactos/include/gdipluscolormatrix.h b/reactos/include/psdk/gdipluscolormatrix.h
similarity index 100%
rename from reactos/include/gdipluscolormatrix.h
rename to reactos/include/psdk/gdipluscolormatrix.h
diff --git a/reactos/include/gdipluseffects.h b/reactos/include/psdk/gdipluseffects.h
similarity index 100%
rename from reactos/include/gdipluseffects.h
rename to reactos/include/psdk/gdipluseffects.h
diff --git a/reactos/include/gdiplusenums.h b/reactos/include/psdk/gdiplusenums.h
similarity index 100%
rename from reactos/include/gdiplusenums.h
rename to reactos/include/psdk/gdiplusenums.h
diff --git a/reactos/include/gdiplusflat.h b/reactos/include/psdk/gdiplusflat.h
similarity index 100%
rename from reactos/include/gdiplusflat.h
rename to reactos/include/psdk/gdiplusflat.h
diff --git a/reactos/include/gdiplusgpstubs.h b/reactos/include/psdk/gdiplusgpstubs.h
similarity index 100%
rename from reactos/include/gdiplusgpstubs.h
rename to reactos/include/psdk/gdiplusgpstubs.h
diff --git a/reactos/include/gdiplusgraphics.h b/reactos/include/psdk/gdiplusgraphics.h
similarity index 100%
rename from reactos/include/gdiplusgraphics.h
rename to reactos/include/psdk/gdiplusgraphics.h
diff --git a/reactos/include/gdiplusheaders.h b/reactos/include/psdk/gdiplusheaders.h
similarity index 100%
rename from reactos/include/gdiplusheaders.h
rename to reactos/include/psdk/gdiplusheaders.h
diff --git a/reactos/include/gdiplusimageattributes.h b/reactos/include/psdk/gdiplusimageattributes.h
similarity index 100%
rename from reactos/include/gdiplusimageattributes.h
rename to reactos/include/psdk/gdiplusimageattributes.h
diff --git a/reactos/include/gdiplusimaging.h b/reactos/include/psdk/gdiplusimaging.h
similarity index 100%
rename from reactos/include/gdiplusimaging.h
rename to reactos/include/psdk/gdiplusimaging.h
diff --git a/reactos/include/gdiplusinit.h b/reactos/include/psdk/gdiplusinit.h
similarity index 100%
rename from reactos/include/gdiplusinit.h
rename to reactos/include/psdk/gdiplusinit.h
diff --git a/reactos/include/gdipluslinecaps.h b/reactos/include/psdk/gdipluslinecaps.h
similarity index 100%
rename from reactos/include/gdipluslinecaps.h
rename to reactos/include/psdk/gdipluslinecaps.h
diff --git a/reactos/include/gdiplusmatrix.h b/reactos/include/psdk/gdiplusmatrix.h
similarity index 100%
rename from reactos/include/gdiplusmatrix.h
rename to reactos/include/psdk/gdiplusmatrix.h
diff --git a/reactos/include/gdiplusmem.h b/reactos/include/psdk/gdiplusmem.h
similarity index 100%
rename from reactos/include/gdiplusmem.h
rename to reactos/include/psdk/gdiplusmem.h
diff --git a/reactos/include/gdiplusmetafile.h b/reactos/include/psdk/gdiplusmetafile.h
similarity index 100%
rename from reactos/include/gdiplusmetafile.h
rename to reactos/include/psdk/gdiplusmetafile.h
diff --git a/reactos/include/gdiplusmetaheader.h b/reactos/include/psdk/gdiplusmetaheader.h
similarity index 100%
rename from reactos/include/gdiplusmetaheader.h
rename to reactos/include/psdk/gdiplusmetaheader.h
diff --git a/reactos/include/gdipluspath.h b/reactos/include/psdk/gdipluspath.h
similarity index 100%
rename from reactos/include/gdipluspath.h
rename to reactos/include/psdk/gdipluspath.h
diff --git a/reactos/include/gdipluspen.h b/reactos/include/psdk/gdipluspen.h
similarity index 100%
rename from reactos/include/gdipluspen.h
rename to reactos/include/psdk/gdipluspen.h
diff --git a/reactos/include/gdipluspixelformats.h b/reactos/include/psdk/gdipluspixelformats.h
similarity index 100%
rename from reactos/include/gdipluspixelformats.h
rename to reactos/include/psdk/gdipluspixelformats.h
diff --git a/reactos/include/gdiplusstringformat.h b/reactos/include/psdk/gdiplusstringformat.h
similarity index 100%
rename from reactos/include/gdiplusstringformat.h
rename to reactos/include/psdk/gdiplusstringformat.h
diff --git a/reactos/include/gdiplustypes.h b/reactos/include/psdk/gdiplustypes.h
similarity index 100%
rename from reactos/include/gdiplustypes.h
rename to reactos/include/psdk/gdiplustypes.h
diff --git a/reactos/include/guiddef.h b/reactos/include/psdk/guiddef.h
similarity index 100%
rename from reactos/include/guiddef.h
rename to reactos/include/psdk/guiddef.h
diff --git a/reactos/include/hlink.h b/reactos/include/psdk/hlink.h
similarity index 100%
rename from reactos/include/hlink.h
rename to reactos/include/psdk/hlink.h
diff --git a/reactos/include/httpext.h b/reactos/include/psdk/httpext.h
similarity index 100%
rename from reactos/include/httpext.h
rename to reactos/include/psdk/httpext.h
diff --git a/reactos/include/icmpapi.h b/reactos/include/psdk/icmpapi.h
similarity index 100%
rename from reactos/include/icmpapi.h
rename to reactos/include/psdk/icmpapi.h
diff --git a/reactos/include/idispids.h b/reactos/include/psdk/idispids.h
similarity index 100%
rename from reactos/include/idispids.h
rename to reactos/include/psdk/idispids.h
diff --git a/reactos/include/imagehlp.h b/reactos/include/psdk/imagehlp.h
similarity index 100%
rename from reactos/include/imagehlp.h
rename to reactos/include/psdk/imagehlp.h
diff --git a/reactos/include/imm.h b/reactos/include/psdk/imm.h
similarity index 100%
rename from reactos/include/imm.h
rename to reactos/include/psdk/imm.h
diff --git a/reactos/include/in6addr.h b/reactos/include/psdk/in6addr.h
similarity index 100%
rename from reactos/include/in6addr.h
rename to reactos/include/psdk/in6addr.h
diff --git a/reactos/include/inaddr.h b/reactos/include/psdk/inaddr.h
similarity index 100%
rename from reactos/include/inaddr.h
rename to reactos/include/psdk/inaddr.h
diff --git a/reactos/include/initguid.h b/reactos/include/psdk/initguid.h
similarity index 100%
rename from reactos/include/initguid.h
rename to reactos/include/psdk/initguid.h
diff --git a/reactos/include/intshcut.h b/reactos/include/psdk/intshcut.h
similarity index 100%
rename from reactos/include/intshcut.h
rename to reactos/include/psdk/intshcut.h
diff --git a/reactos/include/ipexport.h b/reactos/include/psdk/ipexport.h
similarity index 100%
rename from reactos/include/ipexport.h
rename to reactos/include/psdk/ipexport.h
diff --git a/reactos/include/iphlpapi.h b/reactos/include/psdk/iphlpapi.h
similarity index 100%
rename from reactos/include/iphlpapi.h
rename to reactos/include/psdk/iphlpapi.h
diff --git a/reactos/include/ipifcons.h b/reactos/include/psdk/ipifcons.h
similarity index 100%
rename from reactos/include/ipifcons.h
rename to reactos/include/psdk/ipifcons.h
diff --git a/reactos/include/iprtrmib.h b/reactos/include/psdk/iprtrmib.h
similarity index 100%
rename from reactos/include/iprtrmib.h
rename to reactos/include/psdk/iprtrmib.h
diff --git a/reactos/include/iptypes.h b/reactos/include/psdk/iptypes.h
similarity index 100%
rename from reactos/include/iptypes.h
rename to reactos/include/psdk/iptypes.h
diff --git a/reactos/include/isguids.h b/reactos/include/psdk/isguids.h
similarity index 100%
rename from reactos/include/isguids.h
rename to reactos/include/psdk/isguids.h
diff --git a/reactos/include/ksguid.h b/reactos/include/psdk/ksguid.h
similarity index 100%
rename from reactos/include/ksguid.h
rename to reactos/include/psdk/ksguid.h
diff --git a/reactos/include/ksuuids.h b/reactos/include/psdk/ksuuids.h
similarity index 100%
rename from reactos/include/ksuuids.h
rename to reactos/include/psdk/ksuuids.h
diff --git a/reactos/include/largeint.h b/reactos/include/psdk/largeint.h
similarity index 100%
rename from reactos/include/largeint.h
rename to reactos/include/psdk/largeint.h
diff --git a/reactos/include/lm.h b/reactos/include/psdk/lm.h
similarity index 100%
rename from reactos/include/lm.h
rename to reactos/include/psdk/lm.h
diff --git a/reactos/include/lmaccess.h b/reactos/include/psdk/lmaccess.h
similarity index 100%
rename from reactos/include/lmaccess.h
rename to reactos/include/psdk/lmaccess.h
diff --git a/reactos/include/lmalert.h b/reactos/include/psdk/lmalert.h
similarity index 100%
rename from reactos/include/lmalert.h
rename to reactos/include/psdk/lmalert.h
diff --git a/reactos/include/lmapibuf.h b/reactos/include/psdk/lmapibuf.h
similarity index 100%
rename from reactos/include/lmapibuf.h
rename to reactos/include/psdk/lmapibuf.h
diff --git a/reactos/include/lmat.h b/reactos/include/psdk/lmat.h
similarity index 100%
rename from reactos/include/lmat.h
rename to reactos/include/psdk/lmat.h
diff --git a/reactos/include/lmaudit.h b/reactos/include/psdk/lmaudit.h
similarity index 100%
rename from reactos/include/lmaudit.h
rename to reactos/include/psdk/lmaudit.h
diff --git a/reactos/include/lmchdev.h b/reactos/include/psdk/lmchdev.h
similarity index 100%
rename from reactos/include/lmchdev.h
rename to reactos/include/psdk/lmchdev.h
diff --git a/reactos/include/lmconfig.h b/reactos/include/psdk/lmconfig.h
similarity index 100%
rename from reactos/include/lmconfig.h
rename to reactos/include/psdk/lmconfig.h
diff --git a/reactos/include/lmcons.h b/reactos/include/psdk/lmcons.h
similarity index 100%
rename from reactos/include/lmcons.h
rename to reactos/include/psdk/lmcons.h
diff --git a/reactos/include/lmerr.h b/reactos/include/psdk/lmerr.h
similarity index 100%
rename from reactos/include/lmerr.h
rename to reactos/include/psdk/lmerr.h
diff --git a/reactos/include/lmerrlog.h b/reactos/include/psdk/lmerrlog.h
similarity index 100%
rename from reactos/include/lmerrlog.h
rename to reactos/include/psdk/lmerrlog.h
diff --git a/reactos/include/lmjoin.h b/reactos/include/psdk/lmjoin.h
similarity index 100%
rename from reactos/include/lmjoin.h
rename to reactos/include/psdk/lmjoin.h
diff --git a/reactos/include/lmmsg.h b/reactos/include/psdk/lmmsg.h
similarity index 100%
rename from reactos/include/lmmsg.h
rename to reactos/include/psdk/lmmsg.h
diff --git a/reactos/include/lmremutl.h b/reactos/include/psdk/lmremutl.h
similarity index 100%
rename from reactos/include/lmremutl.h
rename to reactos/include/psdk/lmremutl.h
diff --git a/reactos/include/lmrepl.h b/reactos/include/psdk/lmrepl.h
similarity index 100%
rename from reactos/include/lmrepl.h
rename to reactos/include/psdk/lmrepl.h
diff --git a/reactos/include/lmserver.h b/reactos/include/psdk/lmserver.h
similarity index 100%
rename from reactos/include/lmserver.h
rename to reactos/include/psdk/lmserver.h
diff --git a/reactos/include/lmshare.h b/reactos/include/psdk/lmshare.h
similarity index 100%
rename from reactos/include/lmshare.h
rename to reactos/include/psdk/lmshare.h
diff --git a/reactos/include/lmsname.h b/reactos/include/psdk/lmsname.h
similarity index 100%
rename from reactos/include/lmsname.h
rename to reactos/include/psdk/lmsname.h
diff --git a/reactos/include/lmstats.h b/reactos/include/psdk/lmstats.h
similarity index 100%
rename from reactos/include/lmstats.h
rename to reactos/include/psdk/lmstats.h
diff --git a/reactos/include/lmsvc.h b/reactos/include/psdk/lmsvc.h
similarity index 100%
rename from reactos/include/lmsvc.h
rename to reactos/include/psdk/lmsvc.h
diff --git a/reactos/include/lmuse.h b/reactos/include/psdk/lmuse.h
similarity index 100%
rename from reactos/include/lmuse.h
rename to reactos/include/psdk/lmuse.h
diff --git a/reactos/include/lmuseflg.h b/reactos/include/psdk/lmuseflg.h
similarity index 100%
rename from reactos/include/lmuseflg.h
rename to reactos/include/psdk/lmuseflg.h
diff --git a/reactos/include/lmwksta.h b/reactos/include/psdk/lmwksta.h
similarity index 100%
rename from reactos/include/lmwksta.h
rename to reactos/include/psdk/lmwksta.h
diff --git a/reactos/include/lzexpand.h b/reactos/include/psdk/lzexpand.h
similarity index 100%
rename from reactos/include/lzexpand.h
rename to reactos/include/psdk/lzexpand.h
diff --git a/reactos/include/mapi.h b/reactos/include/psdk/mapi.h
similarity index 100%
rename from reactos/include/mapi.h
rename to reactos/include/psdk/mapi.h
diff --git a/reactos/include/mapicode.h b/reactos/include/psdk/mapicode.h
similarity index 100%
rename from reactos/include/mapicode.h
rename to reactos/include/psdk/mapicode.h
diff --git a/reactos/include/mapidefs.h b/reactos/include/psdk/mapidefs.h
similarity index 100%
rename from reactos/include/mapidefs.h
rename to reactos/include/psdk/mapidefs.h
diff --git a/reactos/include/mapiguid.h b/reactos/include/psdk/mapiguid.h
similarity index 100%
rename from reactos/include/mapiguid.h
rename to reactos/include/psdk/mapiguid.h
diff --git a/reactos/include/mapitags.h b/reactos/include/psdk/mapitags.h
similarity index 100%
rename from reactos/include/mapitags.h
rename to reactos/include/psdk/mapitags.h
diff --git a/reactos/include/mapiutil.h b/reactos/include/psdk/mapiutil.h
similarity index 100%
rename from reactos/include/mapiutil.h
rename to reactos/include/psdk/mapiutil.h
diff --git a/reactos/include/mapival.h b/reactos/include/psdk/mapival.h
similarity index 100%
rename from reactos/include/mapival.h
rename to reactos/include/psdk/mapival.h
diff --git a/reactos/include/mapix.h b/reactos/include/psdk/mapix.h
similarity index 100%
rename from reactos/include/mapix.h
rename to reactos/include/psdk/mapix.h
diff --git a/reactos/include/mciavi.h b/reactos/include/psdk/mciavi.h
similarity index 100%
rename from reactos/include/mciavi.h
rename to reactos/include/psdk/mciavi.h
diff --git a/reactos/include/mcx.h b/reactos/include/psdk/mcx.h
similarity index 100%
rename from reactos/include/mcx.h
rename to reactos/include/psdk/mcx.h
diff --git a/reactos/include/mediaerr.h b/reactos/include/psdk/mediaerr.h
similarity index 100%
rename from reactos/include/mediaerr.h
rename to reactos/include/psdk/mediaerr.h
diff --git a/reactos/include/mgmtapi.h b/reactos/include/psdk/mgmtapi.h
similarity index 100%
rename from reactos/include/mgmtapi.h
rename to reactos/include/psdk/mgmtapi.h
diff --git a/reactos/include/mmddk.h b/reactos/include/psdk/mmddk.h
similarity index 100%
rename from reactos/include/mmddk.h
rename to reactos/include/psdk/mmddk.h
diff --git a/reactos/include/mmsystem.h b/reactos/include/psdk/mmsystem.h
similarity index 100%
rename from reactos/include/mmsystem.h
rename to reactos/include/psdk/mmsystem.h
diff --git a/reactos/include/mscat.h b/reactos/include/psdk/mscat.h
similarity index 100%
rename from reactos/include/mscat.h
rename to reactos/include/psdk/mscat.h
diff --git a/reactos/include/mshtmhst.h b/reactos/include/psdk/mshtmhst.h
similarity index 100%
rename from reactos/include/mshtmhst.h
rename to reactos/include/psdk/mshtmhst.h
diff --git a/reactos/include/mshtml.h b/reactos/include/psdk/mshtml.h
similarity index 100%
rename from reactos/include/mshtml.h
rename to reactos/include/psdk/mshtml.h
diff --git a/reactos/include/msi.h b/reactos/include/psdk/msi.h
similarity index 100%
rename from reactos/include/msi.h
rename to reactos/include/psdk/msi.h
diff --git a/reactos/include/msidefs.h b/reactos/include/psdk/msidefs.h
similarity index 100%
rename from reactos/include/msidefs.h
rename to reactos/include/psdk/msidefs.h
diff --git a/reactos/include/msiquery.h b/reactos/include/psdk/msiquery.h
similarity index 100%
rename from reactos/include/msiquery.h
rename to reactos/include/psdk/msiquery.h
diff --git a/reactos/include/mssip.h b/reactos/include/psdk/mssip.h
similarity index 100%
rename from reactos/include/mssip.h
rename to reactos/include/psdk/mssip.h
diff --git a/reactos/include/mswsock.h b/reactos/include/psdk/mswsock.h
similarity index 100%
rename from reactos/include/mswsock.h
rename to reactos/include/psdk/mswsock.h
diff --git a/reactos/include/msxml.h b/reactos/include/psdk/msxml.h
similarity index 100%
rename from reactos/include/msxml.h
rename to reactos/include/psdk/msxml.h
diff --git a/reactos/include/msxmldid.h b/reactos/include/psdk/msxmldid.h
similarity index 100%
rename from reactos/include/msxmldid.h
rename to reactos/include/psdk/msxmldid.h
diff --git a/reactos/include/nb30.h b/reactos/include/psdk/nb30.h
similarity index 100%
rename from reactos/include/nb30.h
rename to reactos/include/psdk/nb30.h
diff --git a/reactos/include/nddeapi.h b/reactos/include/psdk/nddeapi.h
similarity index 100%
rename from reactos/include/nddeapi.h
rename to reactos/include/psdk/nddeapi.h
diff --git a/reactos/include/ndrtypes.h b/reactos/include/psdk/ndrtypes.h
similarity index 100%
rename from reactos/include/ndrtypes.h
rename to reactos/include/psdk/ndrtypes.h
diff --git a/reactos/include/newdev.h b/reactos/include/psdk/newdev.h
similarity index 100%
rename from reactos/include/newdev.h
rename to reactos/include/psdk/newdev.h
diff --git a/reactos/include/npapi.h b/reactos/include/psdk/npapi.h
similarity index 100%
rename from reactos/include/npapi.h
rename to reactos/include/psdk/npapi.h
diff --git a/reactos/include/nspapi.h b/reactos/include/psdk/nspapi.h
similarity index 100%
rename from reactos/include/nspapi.h
rename to reactos/include/psdk/nspapi.h
diff --git a/reactos/include/ntdef.h b/reactos/include/psdk/ntdef.h
similarity index 100%
rename from reactos/include/ntdef.h
rename to reactos/include/psdk/ntdef.h
diff --git a/reactos/include/ntdll.h b/reactos/include/psdk/ntdll.h
similarity index 100%
rename from reactos/include/ntdll.h
rename to reactos/include/psdk/ntdll.h
diff --git a/reactos/include/ntgdi.h b/reactos/include/psdk/ntgdi.h
similarity index 100%
rename from reactos/include/ntgdi.h
rename to reactos/include/psdk/ntgdi.h
diff --git a/reactos/include/ntldap.h b/reactos/include/psdk/ntldap.h
similarity index 100%
rename from reactos/include/ntldap.h
rename to reactos/include/psdk/ntldap.h
diff --git a/reactos/include/ntsecapi.h b/reactos/include/psdk/ntsecapi.h
similarity index 100%
rename from reactos/include/ntsecapi.h
rename to reactos/include/psdk/ntsecapi.h
diff --git a/reactos/include/ntsecpkg.h b/reactos/include/psdk/ntsecpkg.h
similarity index 100%
rename from reactos/include/ntsecpkg.h
rename to reactos/include/psdk/ntsecpkg.h
diff --git a/reactos/include/ntstatus.h b/reactos/include/psdk/ntstatus.h
similarity index 100%
rename from reactos/include/ntstatus.h
rename to reactos/include/psdk/ntstatus.h
diff --git a/reactos/include/oaidl.h b/reactos/include/psdk/oaidl.h
similarity index 100%
rename from reactos/include/oaidl.h
rename to reactos/include/psdk/oaidl.h
diff --git a/reactos/include/objbase.h b/reactos/include/psdk/objbase.h
similarity index 100%
rename from reactos/include/objbase.h
rename to reactos/include/psdk/objbase.h
diff --git a/reactos/include/objfwd.h b/reactos/include/psdk/objfwd.h
similarity index 100%
rename from reactos/include/objfwd.h
rename to reactos/include/psdk/objfwd.h
diff --git a/reactos/include/objidl.h b/reactos/include/psdk/objidl.h
similarity index 100%
rename from reactos/include/objidl.h
rename to reactos/include/psdk/objidl.h
diff --git a/reactos/include/objsel.h b/reactos/include/psdk/objsel.h
similarity index 100%
rename from reactos/include/objsel.h
rename to reactos/include/psdk/objsel.h
diff --git a/reactos/include/ocidl.h b/reactos/include/psdk/ocidl.h
similarity index 100%
rename from reactos/include/ocidl.h
rename to reactos/include/psdk/ocidl.h
diff --git a/reactos/include/odbcinst.h b/reactos/include/psdk/odbcinst.h
similarity index 100%
rename from reactos/include/odbcinst.h
rename to reactos/include/psdk/odbcinst.h
diff --git a/reactos/include/ole.h b/reactos/include/psdk/ole.h
similarity index 100%
rename from reactos/include/ole.h
rename to reactos/include/psdk/ole.h
diff --git a/reactos/include/ole2.h b/reactos/include/psdk/ole2.h
similarity index 100%
rename from reactos/include/ole2.h
rename to reactos/include/psdk/ole2.h
diff --git a/reactos/include/ole2ver.h b/reactos/include/psdk/ole2ver.h
similarity index 100%
rename from reactos/include/ole2ver.h
rename to reactos/include/psdk/ole2ver.h
diff --git a/reactos/include/oleacc.h b/reactos/include/psdk/oleacc.h
similarity index 100%
rename from reactos/include/oleacc.h
rename to reactos/include/psdk/oleacc.h
diff --git a/reactos/include/oleauto.h b/reactos/include/psdk/oleauto.h
similarity index 100%
rename from reactos/include/oleauto.h
rename to reactos/include/psdk/oleauto.h
diff --git a/reactos/include/olectl.h b/reactos/include/psdk/olectl.h
similarity index 100%
rename from reactos/include/olectl.h
rename to reactos/include/psdk/olectl.h
diff --git a/reactos/include/olectlid.h b/reactos/include/psdk/olectlid.h
similarity index 100%
rename from reactos/include/olectlid.h
rename to reactos/include/psdk/olectlid.h
diff --git a/reactos/include/oledlg.h b/reactos/include/psdk/oledlg.h
similarity index 100%
rename from reactos/include/oledlg.h
rename to reactos/include/psdk/oledlg.h
diff --git a/reactos/include/oleidl.h b/reactos/include/psdk/oleidl.h
similarity index 100%
rename from reactos/include/oleidl.h
rename to reactos/include/psdk/oleidl.h
diff --git a/reactos/include/pbt.h b/reactos/include/psdk/pbt.h
similarity index 100%
rename from reactos/include/pbt.h
rename to reactos/include/psdk/pbt.h
diff --git a/reactos/include/poppack.h b/reactos/include/psdk/poppack.h
similarity index 100%
rename from reactos/include/poppack.h
rename to reactos/include/psdk/poppack.h
diff --git a/reactos/include/powrprof.h b/reactos/include/psdk/powrprof.h
similarity index 100%
rename from reactos/include/powrprof.h
rename to reactos/include/psdk/powrprof.h
diff --git a/reactos/include/propidl.h b/reactos/include/psdk/propidl.h
similarity index 100%
rename from reactos/include/propidl.h
rename to reactos/include/psdk/propidl.h
diff --git a/reactos/include/prsht.h b/reactos/include/psdk/prsht.h
similarity index 100%
rename from reactos/include/prsht.h
rename to reactos/include/psdk/prsht.h
diff --git a/reactos/include/psapi.h b/reactos/include/psdk/psapi.h
similarity index 100%
rename from reactos/include/psapi.h
rename to reactos/include/psdk/psapi.h
diff --git a/reactos/include/pshpack1.h b/reactos/include/psdk/pshpack1.h
similarity index 100%
rename from reactos/include/pshpack1.h
rename to reactos/include/psdk/pshpack1.h
diff --git a/reactos/include/pshpack2.h b/reactos/include/psdk/pshpack2.h
similarity index 100%
rename from reactos/include/pshpack2.h
rename to reactos/include/psdk/pshpack2.h
diff --git a/reactos/include/pshpack4.h b/reactos/include/psdk/pshpack4.h
similarity index 100%
rename from reactos/include/pshpack4.h
rename to reactos/include/psdk/pshpack4.h
diff --git a/reactos/include/pshpack8.h b/reactos/include/psdk/pshpack8.h
similarity index 100%
rename from reactos/include/pshpack8.h
rename to reactos/include/psdk/pshpack8.h
diff --git a/reactos/include/pshpck16.h b/reactos/include/psdk/pshpck16.h
similarity index 100%
rename from reactos/include/pshpck16.h
rename to reactos/include/psdk/pshpck16.h
diff --git a/reactos/include/qos.h b/reactos/include/psdk/qos.h
similarity index 100%
rename from reactos/include/qos.h
rename to reactos/include/psdk/qos.h
diff --git a/reactos/include/rapi.h b/reactos/include/psdk/rapi.h
similarity index 100%
rename from reactos/include/rapi.h
rename to reactos/include/psdk/rapi.h
diff --git a/reactos/include/ras.h b/reactos/include/psdk/ras.h
similarity index 100%
rename from reactos/include/ras.h
rename to reactos/include/psdk/ras.h
diff --git a/reactos/include/rasdlg.h b/reactos/include/psdk/rasdlg.h
similarity index 100%
rename from reactos/include/rasdlg.h
rename to reactos/include/psdk/rasdlg.h
diff --git a/reactos/include/raserror.h b/reactos/include/psdk/raserror.h
similarity index 100%
rename from reactos/include/raserror.h
rename to reactos/include/psdk/raserror.h
diff --git a/reactos/include/rassapi.h b/reactos/include/psdk/rassapi.h
similarity index 100%
rename from reactos/include/rassapi.h
rename to reactos/include/psdk/rassapi.h
diff --git a/reactos/include/regstr.h b/reactos/include/psdk/regstr.h
similarity index 100%
rename from reactos/include/regstr.h
rename to reactos/include/psdk/regstr.h
diff --git a/reactos/include/richedit.h b/reactos/include/psdk/richedit.h
similarity index 100%
rename from reactos/include/richedit.h
rename to reactos/include/psdk/richedit.h
diff --git a/reactos/include/richole.h b/reactos/include/psdk/richole.h
similarity index 100%
rename from reactos/include/richole.h
rename to reactos/include/psdk/richole.h
diff --git a/reactos/include/rpc.h b/reactos/include/psdk/rpc.h
similarity index 100%
rename from reactos/include/rpc.h
rename to reactos/include/psdk/rpc.h
diff --git a/reactos/include/rpcdce.h b/reactos/include/psdk/rpcdce.h
similarity index 100%
rename from reactos/include/rpcdce.h
rename to reactos/include/psdk/rpcdce.h
diff --git a/reactos/include/rpcdce2.h b/reactos/include/psdk/rpcdce2.h
similarity index 100%
rename from reactos/include/rpcdce2.h
rename to reactos/include/psdk/rpcdce2.h
diff --git a/reactos/include/rpcdcep.h b/reactos/include/psdk/rpcdcep.h
similarity index 100%
rename from reactos/include/rpcdcep.h
rename to reactos/include/psdk/rpcdcep.h
diff --git a/reactos/include/rpcndr.h b/reactos/include/psdk/rpcndr.h
similarity index 100%
rename from reactos/include/rpcndr.h
rename to reactos/include/psdk/rpcndr.h
diff --git a/reactos/include/rpcnsi.h b/reactos/include/psdk/rpcnsi.h
similarity index 100%
rename from reactos/include/rpcnsi.h
rename to reactos/include/psdk/rpcnsi.h
diff --git a/reactos/include/rpcnsip.h b/reactos/include/psdk/rpcnsip.h
similarity index 100%
rename from reactos/include/rpcnsip.h
rename to reactos/include/psdk/rpcnsip.h
diff --git a/reactos/include/rpcnterr.h b/reactos/include/psdk/rpcnterr.h
similarity index 100%
rename from reactos/include/rpcnterr.h
rename to reactos/include/psdk/rpcnterr.h
diff --git a/reactos/include/rpcproxy.h b/reactos/include/psdk/rpcproxy.h
similarity index 100%
rename from reactos/include/rpcproxy.h
rename to reactos/include/psdk/rpcproxy.h
diff --git a/reactos/include/schannel.h b/reactos/include/psdk/schannel.h
similarity index 100%
rename from reactos/include/schannel.h
rename to reactos/include/psdk/schannel.h
diff --git a/reactos/include/schemadef.h b/reactos/include/psdk/schemadef.h
similarity index 100%
rename from reactos/include/schemadef.h
rename to reactos/include/psdk/schemadef.h
diff --git a/reactos/include/schnlsp.h b/reactos/include/psdk/schnlsp.h
similarity index 100%
rename from reactos/include/schnlsp.h
rename to reactos/include/psdk/schnlsp.h
diff --git a/reactos/include/scrnsave.h b/reactos/include/psdk/scrnsave.h
similarity index 100%
rename from reactos/include/scrnsave.h
rename to reactos/include/psdk/scrnsave.h
diff --git a/reactos/include/sddl.h b/reactos/include/psdk/sddl.h
similarity index 100%
rename from reactos/include/sddl.h
rename to reactos/include/psdk/sddl.h
diff --git a/reactos/include/sdkddkver.h b/reactos/include/psdk/sdkddkver.h
similarity index 100%
rename from reactos/include/sdkddkver.h
rename to reactos/include/psdk/sdkddkver.h
diff --git a/reactos/include/secext.h b/reactos/include/psdk/secext.h
similarity index 100%
rename from reactos/include/secext.h
rename to reactos/include/psdk/secext.h
diff --git a/reactos/include/security.h b/reactos/include/psdk/security.h
similarity index 100%
rename from reactos/include/security.h
rename to reactos/include/psdk/security.h
diff --git a/reactos/include/servprov.h b/reactos/include/psdk/servprov.h
similarity index 100%
rename from reactos/include/servprov.h
rename to reactos/include/psdk/servprov.h
diff --git a/reactos/include/setupapi.h b/reactos/include/psdk/setupapi.h
similarity index 100%
rename from reactos/include/setupapi.h
rename to reactos/include/psdk/setupapi.h
diff --git a/reactos/include/shellapi.h b/reactos/include/psdk/shellapi.h
similarity index 100%
rename from reactos/include/shellapi.h
rename to reactos/include/psdk/shellapi.h
diff --git a/reactos/include/shlguid.h b/reactos/include/psdk/shlguid.h
similarity index 100%
rename from reactos/include/shlguid.h
rename to reactos/include/psdk/shlguid.h
diff --git a/reactos/include/shlobj.h b/reactos/include/psdk/shlobj.h
similarity index 100%
rename from reactos/include/shlobj.h
rename to reactos/include/psdk/shlobj.h
diff --git a/reactos/include/shlwapi.h b/reactos/include/psdk/shlwapi.h
similarity index 100%
rename from reactos/include/shlwapi.h
rename to reactos/include/psdk/shlwapi.h
diff --git a/reactos/include/shtypes.h b/reactos/include/psdk/shtypes.h
similarity index 100%
rename from reactos/include/shtypes.h
rename to reactos/include/psdk/shtypes.h
diff --git a/reactos/include/snmp.h b/reactos/include/psdk/snmp.h
similarity index 100%
rename from reactos/include/snmp.h
rename to reactos/include/psdk/snmp.h
diff --git a/reactos/include/sql.h b/reactos/include/psdk/sql.h
similarity index 100%
rename from reactos/include/sql.h
rename to reactos/include/psdk/sql.h
diff --git a/reactos/include/sqlext.h b/reactos/include/psdk/sqlext.h
similarity index 100%
rename from reactos/include/sqlext.h
rename to reactos/include/psdk/sqlext.h
diff --git a/reactos/include/sqltypes.h b/reactos/include/psdk/sqltypes.h
similarity index 100%
rename from reactos/include/sqltypes.h
rename to reactos/include/psdk/sqltypes.h
diff --git a/reactos/include/sqlucode.h b/reactos/include/psdk/sqlucode.h
similarity index 100%
rename from reactos/include/sqlucode.h
rename to reactos/include/psdk/sqlucode.h
diff --git a/reactos/include/sspi.h b/reactos/include/psdk/sspi.h
similarity index 100%
rename from reactos/include/sspi.h
rename to reactos/include/psdk/sspi.h
diff --git a/reactos/include/strmif.h b/reactos/include/psdk/strmif.h
similarity index 100%
rename from reactos/include/strmif.h
rename to reactos/include/psdk/strmif.h
diff --git a/reactos/include/subauth.h b/reactos/include/psdk/subauth.h
similarity index 100%
rename from reactos/include/subauth.h
rename to reactos/include/psdk/subauth.h
diff --git a/reactos/include/svcguid.h b/reactos/include/psdk/svcguid.h
similarity index 100%
rename from reactos/include/svcguid.h
rename to reactos/include/psdk/svcguid.h
diff --git a/reactos/include/tchar.h b/reactos/include/psdk/tchar.h
similarity index 100%
rename from reactos/include/tchar.h
rename to reactos/include/psdk/tchar.h
diff --git a/reactos/include/tcpioctl.h b/reactos/include/psdk/tcpioctl.h
similarity index 100%
rename from reactos/include/tcpioctl.h
rename to reactos/include/psdk/tcpioctl.h
diff --git a/reactos/include/tlhelp32.h b/reactos/include/psdk/tlhelp32.h
similarity index 100%
rename from reactos/include/tlhelp32.h
rename to reactos/include/psdk/tlhelp32.h
diff --git a/reactos/include/tmschema.h b/reactos/include/psdk/tmschema.h
similarity index 100%
rename from reactos/include/tmschema.h
rename to reactos/include/psdk/tmschema.h
diff --git a/reactos/include/unknwn.h b/reactos/include/psdk/unknwn.h
similarity index 100%
rename from reactos/include/unknwn.h
rename to reactos/include/psdk/unknwn.h
diff --git a/reactos/include/urlmon.h b/reactos/include/psdk/urlmon.h
similarity index 100%
rename from reactos/include/urlmon.h
rename to reactos/include/psdk/urlmon.h
diff --git a/reactos/include/userenv.h b/reactos/include/psdk/userenv.h
similarity index 100%
rename from reactos/include/userenv.h
rename to reactos/include/psdk/userenv.h
diff --git a/reactos/include/uuids.h b/reactos/include/psdk/uuids.h
similarity index 100%
rename from reactos/include/uuids.h
rename to reactos/include/psdk/uuids.h
diff --git a/reactos/include/uxtheme.h b/reactos/include/psdk/uxtheme.h
similarity index 100%
rename from reactos/include/uxtheme.h
rename to reactos/include/psdk/uxtheme.h
diff --git a/reactos/include/vfw.h b/reactos/include/psdk/vfw.h
similarity index 100%
rename from reactos/include/vfw.h
rename to reactos/include/psdk/vfw.h
diff --git a/reactos/include/vfwmsgs.h b/reactos/include/psdk/vfwmsgs.h
similarity index 100%
rename from reactos/include/vfwmsgs.h
rename to reactos/include/psdk/vfwmsgs.h
diff --git a/reactos/include/w32api.h b/reactos/include/psdk/w32api.h
similarity index 100%
rename from reactos/include/w32api.h
rename to reactos/include/psdk/w32api.h
diff --git a/reactos/include/winable.h b/reactos/include/psdk/winable.h
similarity index 100%
rename from reactos/include/winable.h
rename to reactos/include/psdk/winable.h
diff --git a/reactos/include/winbase.h b/reactos/include/psdk/winbase.h
similarity index 100%
rename from reactos/include/winbase.h
rename to reactos/include/psdk/winbase.h
diff --git a/reactos/include/winber.h b/reactos/include/psdk/winber.h
similarity index 100%
rename from reactos/include/winber.h
rename to reactos/include/psdk/winber.h
diff --git a/reactos/include/wincon.h b/reactos/include/psdk/wincon.h
similarity index 100%
rename from reactos/include/wincon.h
rename to reactos/include/psdk/wincon.h
diff --git a/reactos/include/wincrypt.h b/reactos/include/psdk/wincrypt.h
similarity index 100%
rename from reactos/include/wincrypt.h
rename to reactos/include/psdk/wincrypt.h
diff --git a/reactos/include/windef.h b/reactos/include/psdk/windef.h
similarity index 100%
rename from reactos/include/windef.h
rename to reactos/include/psdk/windef.h
diff --git a/reactos/include/windns.h b/reactos/include/psdk/windns.h
similarity index 100%
rename from reactos/include/windns.h
rename to reactos/include/psdk/windns.h
diff --git a/reactos/include/windows.h b/reactos/include/psdk/windows.h
similarity index 100%
rename from reactos/include/windows.h
rename to reactos/include/psdk/windows.h
diff --git a/reactos/include/windowsx.h b/reactos/include/psdk/windowsx.h
similarity index 100%
rename from reactos/include/windowsx.h
rename to reactos/include/psdk/windowsx.h
diff --git a/reactos/include/winefs.h b/reactos/include/psdk/winefs.h
similarity index 100%
rename from reactos/include/winefs.h
rename to reactos/include/psdk/winefs.h
diff --git a/reactos/include/winerror.h b/reactos/include/psdk/winerror.h
similarity index 100%
rename from reactos/include/winerror.h
rename to reactos/include/psdk/winerror.h
diff --git a/reactos/include/winfax.h b/reactos/include/psdk/winfax.h
similarity index 100%
rename from reactos/include/winfax.h
rename to reactos/include/psdk/winfax.h
diff --git a/reactos/include/wingdi.h b/reactos/include/psdk/wingdi.h
similarity index 100%
rename from reactos/include/wingdi.h
rename to reactos/include/psdk/wingdi.h
diff --git a/reactos/include/wininet.h b/reactos/include/psdk/wininet.h
similarity index 100%
rename from reactos/include/wininet.h
rename to reactos/include/psdk/wininet.h
diff --git a/reactos/include/winioctl.h b/reactos/include/psdk/winioctl.h
similarity index 100%
rename from reactos/include/winioctl.h
rename to reactos/include/psdk/winioctl.h
diff --git a/reactos/include/winldap.h b/reactos/include/psdk/winldap.h
similarity index 100%
rename from reactos/include/winldap.h
rename to reactos/include/psdk/winldap.h
diff --git a/reactos/include/winnetwk.h b/reactos/include/psdk/winnetwk.h
similarity index 100%
rename from reactos/include/winnetwk.h
rename to reactos/include/psdk/winnetwk.h
diff --git a/reactos/include/winnls.h b/reactos/include/psdk/winnls.h
similarity index 100%
rename from reactos/include/winnls.h
rename to reactos/include/psdk/winnls.h
diff --git a/reactos/include/winnls32.h b/reactos/include/psdk/winnls32.h
similarity index 100%
rename from reactos/include/winnls32.h
rename to reactos/include/psdk/winnls32.h
diff --git a/reactos/include/winnt.h b/reactos/include/psdk/winnt.h
similarity index 100%
rename from reactos/include/winnt.h
rename to reactos/include/psdk/winnt.h
diff --git a/reactos/include/winperf.h b/reactos/include/psdk/winperf.h
similarity index 100%
rename from reactos/include/winperf.h
rename to reactos/include/psdk/winperf.h
diff --git a/reactos/include/winreg.h b/reactos/include/psdk/winreg.h
similarity index 100%
rename from reactos/include/winreg.h
rename to reactos/include/psdk/winreg.h
diff --git a/reactos/include/winres.h b/reactos/include/psdk/winres.h
similarity index 100%
rename from reactos/include/winres.h
rename to reactos/include/psdk/winres.h
diff --git a/reactos/include/winresrc.h b/reactos/include/psdk/winresrc.h
similarity index 100%
rename from reactos/include/winresrc.h
rename to reactos/include/psdk/winresrc.h
diff --git a/reactos/include/winscard.h b/reactos/include/psdk/winscard.h
similarity index 100%
rename from reactos/include/winscard.h
rename to reactos/include/psdk/winscard.h
diff --git a/reactos/include/winsmcrd.h b/reactos/include/psdk/winsmcrd.h
similarity index 100%
rename from reactos/include/winsmcrd.h
rename to reactos/include/psdk/winsmcrd.h
diff --git a/reactos/include/winsnmp.h b/reactos/include/psdk/winsnmp.h
similarity index 100%
rename from reactos/include/winsnmp.h
rename to reactos/include/psdk/winsnmp.h
diff --git a/reactos/include/winsock.h b/reactos/include/psdk/winsock.h
similarity index 100%
rename from reactos/include/winsock.h
rename to reactos/include/psdk/winsock.h
diff --git a/reactos/include/winsock2.h b/reactos/include/psdk/winsock2.h
similarity index 100%
rename from reactos/include/winsock2.h
rename to reactos/include/psdk/winsock2.h
diff --git a/reactos/include/winspool.h b/reactos/include/psdk/winspool.h
similarity index 100%
rename from reactos/include/winspool.h
rename to reactos/include/psdk/winspool.h
diff --git a/reactos/include/winsvc.h b/reactos/include/psdk/winsvc.h
similarity index 100%
rename from reactos/include/winsvc.h
rename to reactos/include/psdk/winsvc.h
diff --git a/reactos/include/winternl.h b/reactos/include/psdk/winternl.h
similarity index 100%
rename from reactos/include/winternl.h
rename to reactos/include/psdk/winternl.h
diff --git a/reactos/include/wintrust.h b/reactos/include/psdk/wintrust.h
similarity index 100%
rename from reactos/include/wintrust.h
rename to reactos/include/psdk/wintrust.h
diff --git a/reactos/include/winuser.h b/reactos/include/psdk/winuser.h
similarity index 100%
rename from reactos/include/winuser.h
rename to reactos/include/psdk/winuser.h
diff --git a/reactos/include/winver.h b/reactos/include/psdk/winver.h
similarity index 100%
rename from reactos/include/winver.h
rename to reactos/include/psdk/winver.h
diff --git a/reactos/include/winwlx.h b/reactos/include/psdk/winwlx.h
similarity index 100%
rename from reactos/include/winwlx.h
rename to reactos/include/psdk/winwlx.h
diff --git a/reactos/include/ws2spi.h b/reactos/include/psdk/ws2spi.h
similarity index 100%
rename from reactos/include/ws2spi.h
rename to reactos/include/psdk/ws2spi.h
diff --git a/reactos/include/ws2tcpip.h b/reactos/include/psdk/ws2tcpip.h
similarity index 100%
rename from reactos/include/ws2tcpip.h
rename to reactos/include/psdk/ws2tcpip.h
diff --git a/reactos/include/wsahelp.h b/reactos/include/psdk/wsahelp.h
similarity index 100%
rename from reactos/include/wsahelp.h
rename to reactos/include/psdk/wsahelp.h
diff --git a/reactos/include/wsipx.h b/reactos/include/psdk/wsipx.h
similarity index 100%
rename from reactos/include/wsipx.h
rename to reactos/include/psdk/wsipx.h
diff --git a/reactos/include/wsnetbs.h b/reactos/include/psdk/wsnetbs.h
similarity index 100%
rename from reactos/include/wsnetbs.h
rename to reactos/include/psdk/wsnetbs.h
diff --git a/reactos/include/wtypes.h b/reactos/include/psdk/wtypes.h
similarity index 100%
rename from reactos/include/wtypes.h
rename to reactos/include/psdk/wtypes.h
diff --git a/reactos/include/xcmc.h b/reactos/include/psdk/xcmc.h
similarity index 100%
rename from reactos/include/xcmc.h
rename to reactos/include/psdk/xcmc.h
diff --git a/reactos/include/xprtdefs.h b/reactos/include/psdk/xprtdefs.h
similarity index 100%
rename from reactos/include/xprtdefs.h
rename to reactos/include/psdk/xprtdefs.h
diff --git a/reactos/include/zmouse.h b/reactos/include/psdk/zmouse.h
similarity index 100%
rename from reactos/include/zmouse.h
rename to reactos/include/psdk/zmouse.h
diff --git a/reactos/include/reactos/debug.h b/reactos/include/reactos/debug.h
index a668913b79f..9f2f4c3b0d1 100644
--- a/reactos/include/reactos/debug.h
+++ b/reactos/include/reactos/debug.h
@@ -87,7 +87,7 @@ RtlAssert(
         #ifdef _MSC_VER
             static __inline void DPRINT ( const char* fmt, ... )
             {
-                //UNREFERENCED_PARAMETER(fmt);
+                UNREFERENCED_PARAMETER(fmt);
             }
         #else
             #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
diff --git a/reactos/include/reactos/wine/list.h b/reactos/include/reactos/wine/list.h
index ce4c968595a..392edd94a39 100644
--- a/reactos/include/reactos/wine/list.h
+++ b/reactos/include/reactos/wine/list.h
@@ -63,7 +63,7 @@ struct list
  */
 
 /* add an element after the specified one */
-inline static void list_add_after( struct list *elem, struct list *to_add )
+__inline static void list_add_after( struct list *elem, struct list *to_add )
 {
     to_add->next = elem->next;
     to_add->prev = elem;
@@ -72,7 +72,7 @@ inline static void list_add_after( struct list *elem, struct list *to_add )
 }
 
 /* add an element before the specified one */
-inline static void list_add_before( struct list *elem, struct list *to_add )
+__inline static void list_add_before( struct list *elem, struct list *to_add )
 {
     to_add->next = elem;
     to_add->prev = elem->prev;
@@ -81,26 +81,26 @@ inline static void list_add_before( struct list *elem, struct list *to_add )
 }
 
 /* add element at the head of the list */
-inline static void list_add_head( struct list *list, struct list *elem )
+__inline static void list_add_head( struct list *list, struct list *elem )
 {
     list_add_after( list, elem );
 }
 
 /* add element at the tail of the list */
-inline static void list_add_tail( struct list *list, struct list *elem )
+__inline static void list_add_tail( struct list *list, struct list *elem )
 {
     list_add_before( list, elem );
 }
 
 /* remove an element from its list */
-inline static void list_remove( struct list *elem )
+__inline static void list_remove( struct list *elem )
 {
     elem->next->prev = elem->prev;
     elem->prev->next = elem->next;
 }
 
 /* get the next element */
-inline static struct list *list_next( struct list *list, struct list *elem )
+__inline static struct list *list_next( struct list *list, struct list *elem )
 {
     struct list *ret = elem->next;
     if (elem->next == list) ret = NULL;
@@ -108,7 +108,7 @@ inline static struct list *list_next( struct list *list, struct list *elem )
 }
 
 /* get the previous element */
-inline static struct list *list_prev( struct list *list, struct list *elem )
+__inline static struct list *list_prev( struct list *list, struct list *elem )
 {
     struct list *ret = elem->prev;
     if (elem->prev == list) ret = NULL;
@@ -116,25 +116,25 @@ inline static struct list *list_prev( struct list *list, struct list *elem )
 }
 
 /* get the first element */
-inline static struct list *list_head( struct list *list )
+__inline static struct list *list_head( struct list *list )
 {
     return list_next( list, list );
 }
 
 /* get the last element */
-inline static struct list *list_tail( struct list *list )
+__inline static struct list *list_tail( struct list *list )
 {
     return list_prev( list, list );
 }
 
 /* check if a list is empty */
-inline static int list_empty( struct list *list )
+__inline static int list_empty( struct list *list )
 {
     return list->next == list;
 }
 
 /* initialize a list */
-inline static void list_init( struct list *list )
+__inline static void list_init( struct list *list )
 {
     list->next = list->prev = list;
 }