diff --git a/reactos/include/ddk/ntsam.h b/reactos/include/ddk/ntsam.h
index 9a8c3a185b2..ba0771ec9ff 100644
--- a/reactos/include/ddk/ntsam.h
+++ b/reactos/include/ddk/ntsam.h
@@ -262,11 +262,68 @@ typedef enum _DOMAIN_SERVER_ROLE
     DomainServerRolePrimary
 } DOMAIN_SERVER_ROLE, *PDOMAIN_SERVER_ROLE;
 
+#include "pshpack4.h"
+typedef struct _DOMAIN_GENERAL_INFORMATION
+{
+    LARGE_INTEGER ForceLogoff;
+    UNICODE_STRING OemInformation;
+    UNICODE_STRING DomainName;
+    UNICODE_STRING ReplicaSourceNodeName;
+    LARGE_INTEGER DomainModifiedCount;
+    DOMAIN_SERVER_ENABLE_STATE DomainServerState;
+    DOMAIN_SERVER_ROLE DomainServerRole;
+    BOOLEAN UasCompatibilityRequired;
+    ULONG UserCount;
+    ULONG GroupCount;
+    ULONG AliasCount;
+} DOMAIN_GENERAL_INFORMATION, *PDOMAIN_GENERAL_INFORMATION;
+#include "poppack.h"
+
+typedef struct _DOMAIN_LOGOFF_INFORMATION
+{
+    LARGE_INTEGER ForceLogoff;
+} DOMAIN_LOGOFF_INFORMATION, *PDOMAIN_LOGOFF_INFORMATION;
+
+typedef struct _DOMAIN_OEM_INFORMATION
+{
+    UNICODE_STRING OemInformation;
+} DOMAIN_OEM_INFORMATION, *PDOMAIN_OEM_INFORMATION;
+
 typedef struct _DOMAIN_NAME_INFORMATION
 {
     UNICODE_STRING DomainName;
 } DOMAIN_NAME_INFORMATION, *PDOMAIN_NAME_INFORMATION;
 
+typedef struct _DOMAIN_REPLICATION_INFORMATION
+{
+    UNICODE_STRING ReplicaSourceNodeName;
+} DOMAIN_REPLICATION_INFORMATION, *PDOMAIN_REPLICATION_INFORMATION;
+
+typedef struct _DOMAIN_SERVER_ROLE_INFORMATION
+{
+    DOMAIN_SERVER_ROLE DomainServerRole;
+} DOMAIN_SERVER_ROLE_INFORMATION, *PDOMAIN_SERVER_ROLE_INFORMATION;
+
+typedef struct _DOMAIN_STATE_INFORMATION
+{
+    DOMAIN_SERVER_ENABLE_STATE DomainServerState;
+} DOMAIN_STATE_INFORMATION, *PDOMAIN_STATE_INFORMATION;
+
+typedef struct _DOMAIN_UAS_INFORMATION
+{
+    BOOLEAN UasCompatibilityRequired;
+} DOMAIN_UAS_INFORMATION;
+
+#include "pshpack4.h"
+typedef struct _DOMAIN_GENERAL_INFORMATION2
+{
+    DOMAIN_GENERAL_INFORMATION I1;
+    LARGE_INTEGER LockoutDuration;
+    LARGE_INTEGER LockoutObservationWindow;
+    USHORT LockoutThreshold;
+} DOMAIN_GENERAL_INFORMATION2, *PDOMAIN_GENERAL_INFORMATION2;
+#include "poppack.h"
+
 typedef enum _GROUP_INFORMATION_CLASS
 {
     GroupGeneralInformation = 1,
diff --git a/reactos/include/reactos/idl/sam.idl b/reactos/include/reactos/idl/sam.idl
index dbecb57ec2a..6bfdaa97f62 100644
--- a/reactos/include/reactos/idl/sam.idl
+++ b/reactos/include/reactos/idl/sam.idl
@@ -143,12 +143,12 @@ typedef enum _DOMAIN_SERVER_ENABLE_STATE
     DomainServerEnabled = 1,
     DomainServerDisabled
 } DOMAIN_SERVER_ENABLE_STATE, *PDOMAIN_SERVER_ENABLE_STATE;
-cpp_quote("#endif")
 
 typedef struct _DOMAIN_STATE_INFORMATION
 {
     DOMAIN_SERVER_ENABLE_STATE DomainServerState;
 } DOMAIN_STATE_INFORMATION, *PDOMAIN_STATE_INFORMATION;
+cpp_quote("#endif")
 
 cpp_quote("#ifndef _NTSAM_")
 typedef enum _DOMAIN_SERVER_ROLE
@@ -169,6 +169,7 @@ typedef struct _DOMAIN_PASSWORD_INFORMATION
 } DOMAIN_PASSWORD_INFORMATION, *PDOMAIN_PASSWORD_INFORMATION;
 cpp_quote("#endif")
 
+cpp_quote("#ifndef _NTSAM_")
 typedef struct _DOMAIN_LOGOFF_INFORMATION
 {
     OLD_LARGE_INTEGER ForceLogoff;
@@ -178,6 +179,7 @@ typedef struct _DOMAIN_SERVER_ROLE_INFORMATION
 {
     DOMAIN_SERVER_ROLE DomainServerRole;
 } DOMAIN_SERVER_ROLE_INFORMATION, *PDOMAIN_SERVER_ROLE_INFORMATION;
+cpp_quote("#endif")
 
 typedef struct _DOMAIN_MODIFIED_INFORMATION
 {