#endif
#endif /* NO_CONFIG_H */
-#include "local.h"
-
#include "system/time.h"
#include "system/wait.h"
+#include "system/locale.h"
+
+/* only do the C++ reserved word check when we compile
+ to include --with-developer since too many systems
+ still have comflicts with their header files (e.g. IRIX 6.4) */
+
+#if !defined(__cplusplus) && defined(DEVELOPER) && defined(__linux__)
+#define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#endif
/* Lists, trees, caching, database... */
-#include <stdlib.h>
-#include <stdbool.h>
#include <talloc.h>
#ifndef _PRINTF_ATTRIBUTE
#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
#endif
-#include "../lib/util/util.h"
+#include "../lib/util/attr.h"
+
+/* debug.h need to be included before samba_util.h for the macro SMB_ASSERT */
#include "../lib/util/debug.h"
+#include "../lib/util/samba_util.h"
#include "libcli/util/error.h"
/* String routines */
#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
+/* Thread functions. */
+#include "../lib/util/smb_threads.h"
+#include "../lib/util/smb_threads_internal.h"
+
+/* samba_setXXid functions. */
+#include "../lib/util/setid.h"
#endif /* _INCLUDES_H */