updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 0291158c4002bf1cfd372a03d4c6e25f28bb711a..c7182023028bd443f67b36dd1f12fde9c08223f8 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -35,8 +35,10 @@
 #endif
 
 #if defined(__EPOC32__)
+#ifndef SILC_EPOC
 #define SILC_EPOC
 #endif
+#endif
 
 #ifdef SILC_WIN32
 #include "silcwin32.h"
@@ -261,9 +263,9 @@ typedef uint32 * void *;
 #include "silclist.h"
 #include "silcdlist.h"
 #include "silcbuffer.h"
-#include "silcbufutil.h"
 #include "silcbuffmt.h"
 #include "silcnet.h"
+#include "silcfileutil.h"
 #include "silcutil.h"
 #include "silcconfig.h"
 #include "silcprotocol.h"
@@ -289,8 +291,8 @@ typedef uint32 * void *;
 
 /* SILC Key Exchange library includes */
 #include "silcske.h"
-#include "payload.h"
-#include "groups.h"
+#include "silcske_payload.h"
+#include "silcske_groups.h"
 
 /* SILC SFTP library */
 #include "silcsftp.h"