#include <dlfcn.h>
#endif
+#ifndef HAVE_GETOPT_LONG
+#include "../lib/contrib/getopt.h"
+#endif
+
#ifndef TRUE
#define TRUE 1
#endif
#include "silcrng.h"
#include "silcpkcs.h"
-/* SILC core library includes */
+/* SILC util library includes */
#include "silclog.h"
#include "silcmemory.h"
#include "silcbuffer.h"
#include "silcnet.h"
#include "silcutil.h"
#include "silcconfig.h"
-#include "id.h"
-#include "idcache.h"
#include "silctask.h"
#include "silcschedule.h"
+
+/* SILC core library includes */
+#include "id.h"
+#include "idcache.h"
#include "silcprotocol.h"
#include "silcsockconn.h"
+#include "silcpayload.h"
#include "silccommand.h"
#include "silcchannel.h"
#include "silcpacket.h"
+#include "silcnotify.h"
+
+/* TRQ (SilcList API and SilcDList API) */
+#include "silclist.h"
+#include "silcdlist.h"
#ifdef SILC_SIM
/* SILC Module library includes */
#include "groups.h"
#endif
+