#ifndef WIN32
typedef unsigned long long uint64;
typedef signed long long int64;
+#else
+typedef uint32 uint64; /* XXX Use Windows's own 64 bit types */
+typedef int32 int64;
#endif
#else
typedef uint32 uint64;
#endif
#ifndef bool
+#ifndef CXX
#define bool unsigned char
#endif
+#endif
/* Generic global SILC includes */
#include "bitmove.h"
#include "silcutil.h"
#include "silcconfig.h"
#include "silcschedule.h"
+#include "silcprotocol.h"
+#include "silcsockconn.h"
/* SILC core library includes */
#include "silcid.h"
#include "silcidcache.h"
-#include "silcprotocol.h"
-#include "silcsockconn.h"
-#include "silcpayload.h"
+#include "silcargument.h"
#include "silccommand.h"
#include "silcchannel.h"
#include "silcpacket.h"
#include "payload.h"
#include "groups.h"
-#endif
+/* SILC SFTP library */
+#include "silcsftp.h"
+#include "silcsftp_fs.h"
+#endif