Samba3: Include util.h header file rather than having custom prototypes.

[kai/samba.git] / source4 / include / includes.h

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 750ebc4137b31a343822b20fddf112a096746ec7..f925e836c56bcb8a78a351e265ba8fa01ea976d2 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -30,8 +30,6 @@
 #endif
 #endif /* NO_CONFIG_H */
 
-#include "local.h"
-
 #include "system/time.h"
 #include "system/wait.h"
 
@@ -42,22 +40,19 @@
 #ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #endif
-#include "util/util.h"
+#include "../lib/util/xfile.h"
+#include "../lib/util/attr.h"
+#include "../lib/util/debug.h"
+#include "../lib/util/util.h"
 
 #include "libcli/util/error.h"
 
 /* String routines */
-#include "util/safe_string.h"
+#include "../lib/util/safe_string.h"
 
 #if 0
 /* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
 #define TALLOC_ABORT(reason) smb_panic(reason)
 #endif
 
-/* this needs to be a string which is not in the C library. We
-   previously used "init_module", but that meant that modules which
-   did not define this function ended up calling the C library
-   function init_module() which makes a system call */
-#define SAMBA_INIT_MODULE "samba_init_module"
-
 #endif /* _INCLUDES_H */