r8806: Move data representation-independent data into seperate header

[sfrench/samba-autobuild/.git] / source4 / include / includes.h

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 00054b985d5dac11f98f5089e8e99196ce743f44..7b6b2014e66c3f77d005fd615b339d01cb4d1509 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -47,6 +47,10 @@
 #include <stdint.h>
 #endif
 
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -64,6 +68,10 @@
 #include <winsock2.h>
 #endif
 
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif
@@ -125,10 +133,10 @@ extern int errno;
 #include "byteorder.h"
 #include "module.h"
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "librpc/gen_ndr/misc.h"
+#include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/ndr_orpc.h"
-#include "librpc/gen_ndr/ndr_orpc.h"
+#include "librpc/gen_ndr/orpc.h"
 #include "librpc/rpc/dcerpc.h"
 #include "smb_interfaces.h"
 #include "ntvfs/ntvfs.h"
@@ -144,7 +152,7 @@ extern int errno;
 
 /***** automatically generated prototypes *****/
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
-#include "proto.h"
+#include "include/proto.h"
 #undef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2)