#endif
#endif
+#if defined(HAVE_SILCDEFS_H)
/* Automatically generated configuration header */
#include "silcdefs.h"
+#endif /* HAVE_SILCDEFS_H */
/* Platform specific includes */
-#ifdef SILC_WIN32
+#if defined(SILC_WIN32)
#include "silcwin32.h"
#endif
-#ifdef SILC_EPOC
+#if defined(SILC_EPOC)
#include "silcepoc.h"
#endif
-#ifdef SILC_BEOS
+#if defined(SILC_BEOS)
#include "silcbeos.h"
#endif
-#ifdef SILC_OS2
+#if defined(SILC_OS2)
#include "silcos2.h"
#endif
#error assert.h not found in the system
#endif
-#ifndef SILC_WIN32
+#if !defined(SILC_WIN32)
#include <unistd.h>
#include <sys/time.h>
#endif
#ifndef HAVE_REGEX_H
-#include "../lib/contrib/regex.h"
+#include "regex.h"
#else
#include <regex.h>
#endif
#endif /* !SILC_WIN32 */
#ifndef HAVE_GETOPT_LONG
-#include "../lib/contrib/getopt.h"
+#include "getopt.h"
#endif
/* Include generic SILC type definitions */
#include "silctypes.h"
+#include "silcversion.h"
/* Math library includes */
#include "silcmp.h"
#include "silcconfig.h"
#include "silcprotocol.h"
#include "silcsockconn.h"
+#include "silcvcard.h"
/* SILC core library includes */
#include "silcstatus.h"
#include "silcmode.h"
#include "silcauth.h"
#include "silcprivate.h"
+#include "silcattrs.h"
+#include "silcvcard.h"
+#include "silcapputil.h"
-#ifdef SILC_SIM
+#if defined(SILC_SIM)
/* SILC Module library includes */
#include "silcsim.h"
#include "silcsimutil.h"