diff --git a/reactos/ntoskrnl/ps/query.c b/reactos/ntoskrnl/ps/query.c
index 2c8da74e926..3341f402999 100644
--- a/reactos/ntoskrnl/ps/query.c
+++ b/reactos/ntoskrnl/ps/query.c
@@ -14,9 +14,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* FIXME: From winbase.h... what to do? */
-#define SEM_NOALIGNMENTFAULTEXCEPT 0x04
-
 /* Debugging Level */
 ULONG PspTraceLevel = 0;
 
diff --git a/reactos/sdk/include/ndk/rtltypes.h b/reactos/sdk/include/ndk/rtltypes.h
index 5a95ab23e83..c33aee47498 100644
--- a/reactos/sdk/include/ndk/rtltypes.h
+++ b/reactos/sdk/include/ndk/rtltypes.h
@@ -62,6 +62,19 @@ extern "C" {
 //
 #define EXCEPTION_CHAIN_END                                 ((PEXCEPTION_REGISTRATION_RECORD)-1)
 
+//
+// Thread Error Mode Flags
+//
+/* Also defined in psdk/winbase.h */
+#define SEM_FAILCRITICALERRORS          0x0001
+#define SEM_NOGPFAULTERRORBOX           0x0002
+#define SEM_NOALIGNMENTFAULTEXCEPT      0x0004
+#define SEM_NOOPENFILEERRORBOX          0x8000
+
+#define RTL_SEM_FAILCRITICALERRORS      (SEM_FAILCRITICALERRORS     << 4)
+#define RTL_SEM_NOGPFAULTERRORBOX       (SEM_NOGPFAULTERRORBOX      << 4)
+#define RTL_SEM_NOALIGNMENTFAULTEXCEPT  (SEM_NOALIGNMENTFAULTEXCEPT << 4)
+
 //
 // Range and Range List Flags
 //
diff --git a/reactos/sdk/lib/rtl/error.c b/reactos/sdk/lib/rtl/error.c
index 3e67d2f5da3..c453551c6e0 100644
--- a/reactos/sdk/lib/rtl/error.c
+++ b/reactos/sdk/lib/rtl/error.c
@@ -25,10 +25,6 @@
 #define NDEBUG
 #include <debug.h>
 
-#define RTL_SEM_FAILCRITICALERRORS      (SEM_FAILCRITICALERRORS << 4)
-#define RTL_SEM_NOGPFAULTERRORBOX       (SEM_NOGPFAULTERRORBOX << 4)
-#define RTL_SEM_NOALIGNMENTFAULTEXCEPT  (SEM_NOALIGNMENTFAULTEXCEPT << 4)
-
 struct error_table
 {
     DWORD       start;