4 files changed, 6 insertions, 9 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index b3f98d2f2c..6d796da6b3 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -768,7 +768,6 @@ extern int errno;
 
 #include "mutex.h"
 
-#include "librpc/ndr/libndr.h"
 #include "librpc/rpc/dcerpc.h"
 
 #include "rpc_server/dcerpc_server.h"
diff --git a/source4/include/rpc_secdes.h b/source4/include/rpc_secdes.h
index 70191901c7..80cc71fccf 100644
--- a/source4/include/rpc_secdes.h
+++ b/source4/include/rpc_secdes.h
@@ -116,8 +116,8 @@ typedef struct security_ace_info
 
 	/* this stuff may be present when type is XXXX_TYPE_XXXX_OBJECT */
 	uint32  obj_flags; /* xxxx_ACE_OBJECT_xxxx e.g present/inherited present etc */
-	GUID    obj_guid;  /* object GUID */
-	GUID    inh_guid;  /* inherited object GUID */		
+	struct GUID    obj_guid;  /* object GUID */
+	struct GUID    inh_guid;  /* inherited object GUID */		
         /* eof object stuff */
 
 	DOM_SID trustee;
diff --git a/source4/include/smb.h b/source4/include/smb.h
index 9b8bc28614..89623895ed 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -421,7 +421,9 @@ struct vuid_cache {
 #include "smb_acls.h"
 #include "enums.h"
 #include "events.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 #include "smb_interfaces.h"
+#include "librpc/ndr/libndr.h"
 
 typedef struct smb_vfs_handle_struct
 {
diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h
index 4bf557359e..6f820be536 100644
--- a/source4/include/smb_interfaces.h
+++ b/source4/include/smb_interfaces.h
@@ -24,10 +24,6 @@ typedef SMB_BIG_UINT large_t;
 
 /* Globally Unique ID */
 #define GUID_SIZE 16
-typedef struct GUID
-{
-	uint8 info[GUID_SIZE];
-} GUID;
 
 /* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30 */
 typedef struct nttime_info
@@ -946,7 +942,7 @@ union smb_fsinfo {
 			large_t quota_soft;
 			large_t quota_hard;
 			large_t quota_flags;
-			GUID guid;
+			struct GUID guid;
 			char *volume_name;
 			char *fs_type;
 		} out;
@@ -1074,7 +1070,7 @@ union smb_fsinfo {
 		enum fsinfo_level level;
 
 		struct {
-			GUID  guid;
+			struct GUID  guid;
 			large_t unknown[6];
 		} out;
 	} objectid_information;