6 files changed, 9 insertions, 3 deletions
diff --git a/source3/include/core.h b/source3/include/core.h
new file mode 100644
index 0000000000..1f9ddb8b3c
--- /dev/null
+++ b/source3/include/core.h
@@ -0,0 +1,3 @@
+/* dummy file to deal with pidl autogenerated ndr files */
+
+#include "nterr.h"
diff --git a/source3/include/core/nterr.h b/source3/include/core/nterr.h
new file mode 100644
index 0000000000..c56735e772
--- /dev/null
+++ b/source3/include/core/nterr.h
@@ -0,0 +1 @@
+#include "includes.h"
diff --git a/source3/include/dcerpc.h b/source3/include/dcerpc.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/source3/include/dcerpc.h
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 35dd37748a..ab85c0e75e 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1000,7 +1000,8 @@ extern int errno;
 #include "rpc_client.h"
 #include "event.h"
 
-#include "libndr/libndr.h"
+#include "librpc/ndr/libndr.h"
+#include "librpc/gen_ndr/unixinfo.h"
 
 /*
  * Type for wide character dirent structure.
diff --git a/source3/include/ndr.h b/source3/include/ndr.h
new file mode 100644
index 0000000000..a416866ef2
--- /dev/null
+++ b/source3/include/ndr.h
@@ -0,0 +1 @@
+/* dummy file to deal with pidl autogenerated ndr files */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 741b4a9d53..6bc8680f86 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -287,8 +287,8 @@ typedef struct dom_sid {
 	uint32 sub_auths[MAXSUBAUTHS];  
 } DOM_SID;
 
-#include "libndr/misc.h"
-#include "libndr/security.h"
+#include "librpc/ndr/misc.h"
+#include "librpc/ndr/security.h"
 
 struct lsa_dom_info {
 	BOOL valid;