diff --git a/reactos/include/sm/api.h b/reactos/include/sm/api.h
index adda4b2c554..ecca2b89d0c 100644
--- a/reactos/include/sm/api.h
+++ b/reactos/include/sm/api.h
@@ -2,9 +2,7 @@
 #ifndef __SM_API_H
 #define __SM_API_H
 
-#define SM_API_PORT_NAME   L"\\SmApiPort"
-#define SM_DBGSS_PORT_NAME L"\\DbgSsApiPort"
-#define SM_DBGUI_PORT_NAME L"\\DbgUiApiPort"
+#include <sm/ns.h>
 
 #pragma pack(push,4)
 
diff --git a/reactos/include/sm/helper.h b/reactos/include/sm/helper.h
index 5555f47c444..01bc9a1f938 100644
--- a/reactos/include/sm/helper.h
+++ b/reactos/include/sm/helper.h
@@ -1,6 +1,6 @@
-#ifndef INCLUDE_SM_HELPER_H
+#if !defined(INCLUDE_SM_HELPER_H)
 #define INCLUDE_SM_HELPER_H
-#define _SM_HELPER_H
+
 /* $Id$ */
 
 /* smdll/connect.c */
diff --git a/reactos/include/sm/ns.h b/reactos/include/sm/ns.h
new file mode 100644
index 00000000000..fde7f80a431
--- /dev/null
+++ b/reactos/include/sm/ns.h
@@ -0,0 +1,13 @@
+#if !defined(INCLUDE_SM_NS_H)
+#define INCLUDE_SM_NS_H
+
+/* $Id: helper.h 13689 2005-02-20 16:46:10Z ea $ */
+
+#define SM_REGISTRY_ROOT_NAME	     L"\\Session Manager"
+#define SM_REGISTRY_SUBSYSTEMS_NAME  L"SubSystems"
+
+#define SM_API_PORT_NAME    L"\\SmApiPort"
+#define SM_DBGSS_PORT_NAME  L"\\DbgSsApiPort"
+#define SM_DBGUI_PORT_NAME  L"\\DbgUiApiPort"
+
+#endif /* ndef INCLUDE_SM_NS_H */