extern "C" {
#endif
+#define SILC_UNIX
+
#ifdef WIN32
#ifndef SILC_WIN32
#define SILC_WIN32
+#undef SILC_UNIX
#endif
#endif
#if defined(__EPOC32__)
#ifndef SILC_EPOC
#define SILC_EPOC
+#undef SILC_UNIX
#endif
#endif
#ifdef BEOS
#ifndef SILC_BEOS
#define SILC_BEOS
+#undef SILC_UNIX
#endif
#elif defined(__BEOS__)
#ifndef SILC_BEOS
#define SILC_BEOS
+#undef SILC_UNIX
#endif
#endif
#if defined(OS2)
#ifndef SILC_OS2
#define SILC_OS2
+#undef SILC_UNIX
#endif
#endif
#endif
#ifndef HAVE_REGEX_H
-#include "../lib/contrib/regex.h"
+#include "regex.h"
#else
#include <regex.h>
#endif
#include <stddef.h>
#endif
-#endif /* !SILC_WIN32 */
-
-#ifndef HAVE_GETOPT_LONG
-#include "../lib/contrib/getopt.h"
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
#endif
-/* Define offsetof */
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#ifdef HAVE_UTIME_H
+#include <utime.h>
#endif
-/* Define types. The types must be at least of the specified size */
-
-typedef unsigned char SilcUInt8;
-typedef signed char SilcInt8;
-
-#if SILC_SIZEOF_SHORT > 2
-#error "size of the short must be 2 bytes"
+#ifdef HAVE_ICONV_H
+#include <iconv.h>
#endif
-typedef unsigned short SilcUInt16;
-typedef signed short SilcInt16;
-
-#if SILC_SIZEOF_LONG == 4
-typedef unsigned long SilcUInt32;
-typedef signed long SilcInt32;
-#else
-#if SILC_SIZEOF_INT == 4
-typedef unsigned int SilcUInt32;
-typedef signed int SilcInt32;
-#else
-#if SILC_SIZEOF_LONG_LONG >= 4
-#ifndef WIN32
-typedef unsigned long long SilcUInt32;
-typedef signed long long SilcInt32;
-#endif
-#endif
-#endif
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
#endif
-#if SILC_SIZEOF_LONG >= 8
-typedef unsigned long SilcUInt64;
-typedef signed long SilcInt64;
-#else
-#if SILC_SIZEOF_LONG_LONG >= 8
-#ifndef WIN32
-typedef unsigned long long SilcUInt64;
-typedef signed long long SilcInt64;
-#else
-typedef SilcUInt32 SilcUInt64; /* XXX Use Windows's own 64 bit types */
-typedef SilcInt32 SilcInt64;
-#endif
-#else
-typedef SilcUInt32 SilcUInt64;
-typedef SilcInt32 SilcInt64;
-#endif
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
#endif
-#if SILC_SIZEOF_VOID_P < 4
-typedef SilcUInt32 * void *;
-#endif
+#endif /* !SILC_WIN32 */
-#ifndef __cplusplus
-#ifndef bool
-#define bool unsigned char
-#endif
+#ifndef HAVE_GETOPT_LONG
+#include "getopt.h"
#endif
-/* Generic global SILC includes */
-#include "bitmove.h"
+/* Include generic SILC type definitions */
+#include "silctypes.h"
/* Math library includes */
#include "silcmp.h"
#include "silcbuffmt.h"
#include "silcnet.h"
#include "silcfileutil.h"
+#include "silcstrutil.h"
#include "silcutil.h"
#include "silcconfig.h"
#include "silcprotocol.h"
#include "silcsockconn.h"
/* SILC core library includes */
+#include "silcstatus.h"
#include "silcid.h"
#include "silcidcache.h"
#include "silcargument.h"
#include "silcmode.h"
#include "silcauth.h"
#include "silcprivate.h"
+#include "silcattrs.h"
#ifdef SILC_SIM
/* SILC Module library includes */