diff --git a/lib/hcrypto/camellia-ntt.c b/lib/hcrypto/camellia-ntt.c
index 36c81cab2..a7b357ac6 100644
--- a/lib/hcrypto/camellia-ntt.c
+++ b/lib/hcrypto/camellia-ntt.c
@@ -30,6 +30,7 @@
  *  http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
  */
 
+#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -37,6 +38,8 @@
 #include <krb5-types.h>
 #include "camellia-ntt.h"
 
+#include <roken.h>
+
 /* key constants */
 
 #define CAMELLIA_SIGMA1L (0xA09E667FL)
diff --git a/lib/hcrypto/camellia.c b/lib/hcrypto/camellia.c
index 00635c9fe..c88822db5 100644
--- a/lib/hcrypto/camellia.c
+++ b/lib/hcrypto/camellia.c
@@ -31,12 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id: aes.c 20466 2007-04-20 08:29:05Z lha $");
-#endif
-
 #ifdef KRB5
 #include <krb5-types.h>
 #endif
@@ -46,6 +42,8 @@ RCSID("$Id: aes.c 20466 2007-04-20 08:29:05Z lha $");
 #include "camellia-ntt.h"
 #include "camellia.h"
 
+#include <roken.h>
+
 int
 CAMELLIA_set_key(const unsigned char *userkey,
 		 const int bits, CAMELLIA_KEY *key)