/* Math library includes */
#include "silcmp.h"
-#include "modinv.h"
-#include "mpbin.h"
-#include "silcprimegen.h"
+#include "silcmath.h"
/* Crypto library includes */
#include "silccipher.h"
#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"