--- deliantra/server/include/includes.h	2006/12/11 21:06:58	1.4
+++ deliantra/server/include/includes.h	2006/12/11 21:32:17	1.5
@@ -24,69 +24,34 @@
 #ifndef INCLUDES_H
 #define INCLUDES_H
 
-#if defined(osf1) && !defined(__osf__)
-#  define	__osf__
-#endif
-
-#if defined(sgi) && !defined(__sgi__)
-#  define __sgi__
-#endif
-
-#ifdef sun
-#  ifndef __sun__
-#    define __sun__
-#  endif
-#endif
-
-#if defined(ultrix) && !defined(__ultrix__)
-#  define __ultrix__
-#endif
+// we want those macros, rewriting too much code is annoying
+#define __STDC_LIMIT_MACROS
+#define __STDC_FORMAT_MACROS
 
 /* Include this first, because it lets us know what we are missing */
 #include <autoconf.h>
 
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <stdlib.h>
-
-#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
+using namespace std;
 
-#ifdef __NetBSD__
-#include <math.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
+#include <cstddef>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <csignal>
+#include <csetjmp>
+#include <cmath>
 
-#ifdef HAVE_LIBDMALLOC
-#include <dmalloc.h>
-#endif
+#include <ctype.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <limits.h>
+#include <errno.h>
 
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
+#include <fcntl.h>
 #include <sys/time.h>
-#endif
-
-#if defined(HAVE_TIME_H) && defined(TIME_WITH_SYS_TIME)
-#include <time.h>
-#endif
-
-/* stddef is for offsetof */
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
 #include <sys/types.h>
-
 #include <sys/stat.h>
 
 #include "config.h"
@@ -102,13 +67,5 @@
 #define FALSE 0
 #endif
 
-#if defined(vax) || defined(ibm032)
-size_t strftime(char *, size_t, const char *, const struct tm *);
-time_t mktime(struct tm *);
-#endif
-
-#define I64_PFd PRId64
-#define I64_PFx PRIx64
-
 #endif /* INCLUDES_H */