updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 4fd2d575ba27c2e4109ded0047b127087c520efa..de06ad66e1b432359d15280c930b503a492794d3 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -137,13 +137,12 @@
 #undef int16
 #undef int32
 #undef int64
-#undef bool
 
 typedef unsigned char uint8;
 typedef signed char int8;
 
 #if SILC_SIZEOF_SHORT > 2
-#error "sizeof short must be 2 bytes"
+#error "size of the short must be 2 bytes"
 #endif
 
 typedef unsigned short uint16;
@@ -181,16 +180,16 @@ typedef int32 int64;
 typedef uint32 * void *;
 #endif
 
-typedef unsigned char bool;
+#ifndef bool
+#define bool unsigned char
+#endif
 
 /* Generic global SILC includes */
 #include "bitmove.h"
 
 /* Math library includes */
 #include "silcmp.h"
-#include "modinv.h"
-#include "mpbin.h"
-#include "silcprimegen.h"
+#include "silcmath.h"
 
 /* Crypto library includes */
 #include "silccipher.h"
@@ -200,6 +199,7 @@ typedef unsigned char bool;
 #include "silcpkcs.h"
 
 /* SILC util library includes */
+#include "silchashtable.h"
 #include "silclog.h"
 #include "silcmemory.h"
 #include "silcbuffer.h"
@@ -212,8 +212,8 @@ typedef unsigned char bool;
 #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"