#endif
#ifndef HAVE_REGEX_H
-#include "../lib/contrib/regex.h"
+#include "regex.h"
#else
#include <regex.h>
#endif
#include <termios.h>
#endif
+#ifdef HAVE_UTIME_H
+#include <utime.h>
+#endif
+
+#ifdef HAVE_ICONV_H
+#include <iconv.h>
+#endif
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
#endif /* !SILC_WIN32 */
#ifndef HAVE_GETOPT_LONG
-#include "../lib/contrib/getopt.h"
+#include "getopt.h"
#endif
/* Include generic SILC type definitions */
#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 */