1 files changed, 11 insertions, 10 deletions
diff --git a/winsup/w32api/include/ntdef.h b/winsup/w32api/include/ntdef.h
index 71e84da16..a192a78d7 100644
--- a/winsup/w32api/include/ntdef.h
+++ b/winsup/w32api/include/ntdef.h
@@ -1,8 +1,6 @@
-#ifndef _NTDEF_H_
-#define _NTDEF_H_
-
+#ifndef _NTDEF_H
+#define _NTDEF_H
 #define NTAPI __stdcall
-
 #define OBJ_INHERIT 2L
 #define OBJ_PERMANENT 16L
 #define OBJ_EXCLUSIVE 32L
@@ -10,7 +8,6 @@
 #define OBJ_OPENIF 128L
 #define OBJ_OPENLINK 256L
 #define OBJ_VALID_ATTRIBUTES 498L
-
 #define InitializeObjectAttributes(p,n,a,r,s) { \
   (p)->Length = sizeof( OBJECT_ATTRIBUTES ); \
   (p)->RootDirectory = r; \
@@ -19,17 +16,22 @@
   (p)->SecurityDescriptor = s; \
   (p)->SecurityQualityOfService = NULL; \
 }
-
 #define STATUS_SUCCESS ((NTSTATUS)0)
 #define NT_SUCCESS(x) ((x)>=0)
-
+#if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H)
 typedef LONG NTSTATUS, *PNTSTATUS;
-typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS;
 typedef struct _UNICODE_STRING {
   USHORT Length;
   USHORT MaximumLength;
   PWSTR  Buffer;
 } UNICODE_STRING, *PUNICODE_STRING;
+typedef struct __STRING {
+  USHORT Length;
+  USHORT MaximumLength;
+  PCHAR  Buffer;
+} STRING, *PSTRING;
+#endif
+typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS;
 typedef enum _SECTION_INHERIT {
   ViewShare = 1,
   ViewUnmap = 2
@@ -42,5 +44,4 @@ typedef struct _OBJECT_ATTRIBUTES {
   PVOID SecurityDescriptor;              
   PVOID SecurityQualityOfService;
 } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
-
-#endif /* _NTDEF_H_ */
+#endif /* _NTDEF_H */