diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h
index 01c4f96ea7e..1c223dfc3b4 100644
--- a/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@ -611,6 +611,13 @@ ULONG
 STDCALL
 RtlLengthSid(IN PSID Sid);
 
+VOID 
+STDCALL
+RtlMapGenericMask(
+    PACCESS_MASK AccessMask,
+    PGENERIC_MAPPING GenericMapping
+);
+           
 NTSTATUS 
 STDCALL
 RtlQueryInformationAcl(
@@ -1136,6 +1143,40 @@ VOID
 STDCALL
 RtlAcquirePebLock(VOID);
 
+NTSTATUS
+STDCALL
+RtlCreateProcessParameters (
+    OUT PRTL_USER_PROCESS_PARAMETERS *ProcessParameters,
+    IN PUNICODE_STRING ImagePathName OPTIONAL,
+    IN PUNICODE_STRING DllPath OPTIONAL,
+    IN PUNICODE_STRING CurrentDirectory OPTIONAL,
+    IN PUNICODE_STRING CommandLine OPTIONAL,
+    IN PWSTR Environment OPTIONAL,
+    IN PUNICODE_STRING WindowTitle OPTIONAL,
+    IN PUNICODE_STRING DesktopInfo OPTIONAL,
+    IN PUNICODE_STRING ShellInfo OPTIONAL,
+    IN PUNICODE_STRING RuntimeInfo OPTIONAL
+);
+    
+NTSTATUS
+STDCALL
+RtlCreateUserProcess(
+    IN PUNICODE_STRING ImageFileName,
+    IN ULONG Attributes,
+    IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters,
+    IN PSECURITY_DESCRIPTOR ProcessSecutityDescriptor OPTIONAL,
+    IN PSECURITY_DESCRIPTOR ThreadSecurityDescriptor OPTIONAL,
+    IN HANDLE ParentProcess OPTIONAL,
+    IN BOOLEAN CurrentDirectory,
+    IN HANDLE DebugPort OPTIONAL,
+    IN HANDLE ExceptionPort OPTIONAL,
+    OUT PRTL_PROCESS_INFO ProcessInfo
+);
+
+NTSTATUS
+STDCALL
+RtlDestroyProcessParameters(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters);
+
 VOID
 STDCALL
 RtlReleasePebLock(VOID);
@@ -1328,7 +1369,26 @@ RtlSetBits (
 
 /*
  * PE Functions
- */ 
+ */
+NTSTATUS 
+STDCALL
+LdrVerifyImageMatchesChecksum(
+    IN HANDLE FileHandle,
+    ULONG Unknown1,
+    ULONG Unknown2,
+    ULONG Unknown3
+);
+
+NTSTATUS
+STDCALL
+RtlFindMessage(
+    IN PVOID BaseAddress,
+    IN ULONG Type,
+    IN ULONG Language,
+    IN ULONG MessageId,
+    OUT PRTL_MESSAGE_RESOURCE_ENTRY *MessageResourceEntry
+);
+              
 PVOID
 STDCALL
 RtlImageDirectoryEntryToData(
@@ -1362,10 +1422,26 @@ RtlImageRvaToSection(
 /*
  * Registry Functions
  */
+NTSTATUS
+STDCALL
+RtlCheckRegistryKey(
+    ULONG RelativeTo,
+    PWSTR Path
+);
+    
 NTSTATUS 
 STDCALL
 RtlFormatCurrentUserKeyPath(IN OUT PUNICODE_STRING KeyPath);
     
+NTSTATUS 
+STDCALL
+RtlpNtOpenKey(
+    OUT HANDLE KeyHandle,
+    IN ACCESS_MASK DesiredAccess,
+    IN POBJECT_ATTRIBUTES ObjectAttributes,
+    IN ULONG Unused
+);
+          
 NTSTATUS
 STDCALL
 RtlOpenCurrentUser(
@@ -1393,16 +1469,6 @@ RtlWriteRegistryValue(
     PVOID ValueData,
     ULONG ValueLength
 );
-
-NTSTATUS
-STDCALL
-RtlFindMessage (
-    IN    PVOID                BaseAddress,
-    IN    ULONG                Type,
-    IN    ULONG                Language,
-    IN    ULONG                MessageId,
-    OUT    PRTL_MESSAGE_RESOURCE_ENTRY    *MessageResourceEntry
-    );
   
 /*
  * NLS Functions
diff --git a/reactos/include/ndk/zwtypes.h b/reactos/include/ndk/zwtypes.h
index 637ece5f491..66868a334e6 100644
--- a/reactos/include/ndk/zwtypes.h
+++ b/reactos/include/ndk/zwtypes.h
@@ -20,6 +20,8 @@
 #define EVENT_READ_ACCESS             1
 #define EVENT_WRITE_ACCESS            2
 
+#define PORT_ALL_ACCESS               (0x1)
+
 #define EVENT_PAIR_ALL_ACCESS    (0x1F0000L)
 
 /* ENUMERATIONS **************************************************************/
diff --git a/reactos/subsys/smss/client.c b/reactos/subsys/smss/client.c
index 28fd5d37663..5132c757534 100644
--- a/reactos/subsys/smss/client.c
+++ b/reactos/subsys/smss/client.c
@@ -23,8 +23,6 @@
  *
  * --------------------------------------------------------------------
  */
-#define NTOS_MODE_USER
-#include <ntos.h>
 #include "smss.h"
 #include <sm/helper.h>
 
diff --git a/reactos/subsys/smss/debug.c b/reactos/subsys/smss/debug.c
index 562985311d3..8e9cd5f3993 100644
--- a/reactos/subsys/smss/debug.c
+++ b/reactos/subsys/smss/debug.c
@@ -23,9 +23,6 @@
  *
  * --------------------------------------------------------------------
  */
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <rosrtl/string.h>
 #include "smss.h"
 
 #define NDEBUG
diff --git a/reactos/subsys/smss/init.c b/reactos/subsys/smss/init.c
index 62ff97b8699..0ec746b5bba 100644
--- a/reactos/subsys/smss/init.c
+++ b/reactos/subsys/smss/init.c
@@ -23,9 +23,7 @@
  *
  * --------------------------------------------------------------------
  */
-
 #include "smss.h"
-#include <rosrtl/string.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/smss/initpage.c b/reactos/subsys/smss/initpage.c
index ec0533e48aa..33f1cb6628e 100644
--- a/reactos/subsys/smss/initpage.c
+++ b/reactos/subsys/smss/initpage.c
@@ -24,8 +24,6 @@
  * --------------------------------------------------------------------
  */
 #include "smss.h"
-#include <rosrtl/string.h>
-#include <wchar.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/smss/initss.c b/reactos/subsys/smss/initss.c
index d59b4653d43..10e26b3cd6e 100644
--- a/reactos/subsys/smss/initss.c
+++ b/reactos/subsys/smss/initss.c
@@ -23,12 +23,8 @@
  *
  * --------------------------------------------------------------------
  */
-
-
 #include "smss.h"
 
-#include <rosrtl/string.h>
-
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/subsys/smss/print.c b/reactos/subsys/smss/print.c
index d727e5f4ef1..4a8c4380717 100644
--- a/reactos/subsys/smss/print.c
+++ b/reactos/subsys/smss/print.c
@@ -23,8 +23,8 @@
  *
  * --------------------------------------------------------------------
  */
-#define NTOS_MODE_USER
-#include <ntos.h>
+#include "smss.h"
+
 
 VOID STDCALL DisplayString(LPCWSTR lpwString)
 {
diff --git a/reactos/subsys/smss/smapi.c b/reactos/subsys/smss/smapi.c
index 17e169e2fa0..8920b9f0488 100644
--- a/reactos/subsys/smss/smapi.c
+++ b/reactos/subsys/smss/smapi.c
@@ -5,9 +5,7 @@
  * Reactos Session Manager
  *
  */
-
 #include "smss.h"
-#include <rosrtl/string.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/smss/smss.c b/reactos/subsys/smss/smss.c
index 627677a1c85..715539edc8d 100644
--- a/reactos/subsys/smss/smss.c
+++ b/reactos/subsys/smss/smss.c
@@ -24,7 +24,6 @@
  * --------------------------------------------------------------------
  */
 #include "smss.h"
-#include <rosrtl/string.h>
 #include <reactos/buildno.h>
 
 #define NDEBUG
diff --git a/reactos/subsys/smss/smss.h b/reactos/subsys/smss/smss.h
index ec71c149fb1..81f309d03c5 100644
--- a/reactos/subsys/smss/smss.h
+++ b/reactos/subsys/smss/smss.h
@@ -1,8 +1,13 @@
 #ifndef _SMSS_H_INCLUDED_
 #define _SMSS_H_INCLUDED_
 
+#include <windows.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
+#include <ndk/ntndk.h>
+
+#include <rosrtl/string.h>
+#include <wchar.h>
+
 #include <sm/api.h>
 #include <sm/helper.h>