#include <grp.h>
#endif
-#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT)
-#include <getopt.h>
-#else
-#if defined(HAVE_SILCDEFS_H)
-#include "getopti.h"
-#endif /* HAVE_SILCDEFS_H */
-#endif
-
#ifdef SOCKS5
#include "socks.h"
#endif
#include <limits.h>
#endif
-#ifndef HAVE_REGEX_H
-#if defined(HAVE_SILCDEFS_H)
-#include "regexpr.h"
-#endif /* HAVE_SILCDEFS_H */
-#else
-#include <regex.h>
-#endif
-
#ifdef SILC_HAVE_PTHREAD
#include <pthread.h>
#endif
#endif /* !SILC_WIN32 */
/* Include generic SILC type definitions */
+#include "silcerrno.h"
#include "silctypes.h"
+#include "silcbitops.h"
#include "silcmutex.h"
#include "silcatomic.h"
#include "silcversion.h"
/* SILC util library includes */
+#include "silcgetopt.h"
#include "silclist.h"
#include "silcstack.h"
#include "silcmemory.h"
#include "silcthread.h"
#include "silcschedule.h"
#include "silclog.h"
+#include "silcfileutil.h"
#include "silcbuffer.h"
#include "silcbuffmt.h"
#include "silcasync.h"
#endif /* SILC_DIST_SSH */
/* More SILC util library includes */
+#include "silcregex.h"
#include "silcenv.h"
#include "silcdll.h"
#include "silchashtable.h"
#include "silcstream.h"
#include "silcnet.h"
-#include "silcfileutil.h"
#include "silcbase64.h"
#include "silcstrutil.h"
#include "silcutf8.h"
#include "silcfsm.h"
#include "silcsocketstream.h"
#include "silcfdstream.h"
-#include "silcvcard.h"
#include "silcmime.h"
+#ifdef SILC_DIST_VCARD
+#include "silcvcard.h"
+#endif /* SILC_DIST_VCARD */
+
#ifdef SILC_DIST_ASN1
#include "silcasn1.h"
#include "silcber.h"