updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index c19b4971d4d257e083d85d9d8836ea8faad6fed2..f99e5e0976c25eeed17be8fc86f59d4cecb9daf1 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -29,33 +29,23 @@
 /* Automatically generated configuration header */
 #include "silcdefs.h"
 
+#ifdef SILC_WIN32
+#include <windows.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdarg.h>
-#include <pwd.h>
-#include <grp.h>
-
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/times.h>
 #include <time.h>
 
-#ifdef SOCKS5
-#include "socks.h"
-#endif
-
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
 #ifdef HAVE_SIGNAL_H
-#undef __USE_GNU
 #include <signal.h>
-#define __USE_GNU 1
 #else
 #error signal.h not found in the system
 #endif
@@ -78,6 +68,20 @@
 #error assert.h not found in the system
 #endif
 
+#ifndef SILC_WIN32
+
+#include <pwd.h>
+#include <grp.h>
+#include <sys/times.h>
+
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
+#ifdef SOCKS5
+#include "socks.h"
+#endif
+
 #include <sys/socket.h>
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -111,6 +115,8 @@
 #include <dlfcn.h>
 #endif
 
+#endif                         /* !SILC_WIN32 */
+
 #ifndef HAVE_GETOPT_LONG
 #include "../lib/contrib/getopt.h"
 #endif
@@ -189,9 +195,7 @@ typedef uint32 * void *;
 
 /* Math library includes */
 #include "silcmp.h"
-#include "modinv.h"
-#include "mpbin.h"
-#include "silcprimegen.h"
+#include "silcmath.h"
 
 /* Crypto library includes */
 #include "silccipher.h"
@@ -214,8 +218,8 @@ typedef uint32 * void *;
 #include "silcschedule.h"
 
 /* SILC core library includes */
-#include "id.h"
-#include "idcache.h"
+#include "silcid.h"
+#include "silcidcache.h"
 #include "silcprotocol.h"
 #include "silcsockconn.h"
 #include "silcpayload.h"