diff --git a/lib/roken/gettimeofday.c b/lib/roken/gettimeofday.c
index 8aad65267..b1250afc0 100644
--- a/lib/roken/gettimeofday.c
+++ b/lib/roken/gettimeofday.c
@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  */
 
-#include "krb_locl.h"
+#include "roken.h"
+#ifndef HAVE_GETTIMEOFDAY
+
 RCSID("$Id$");
 
-#ifndef HAVE_GETTIMEOFDAY
 /*
  * Simple gettimeofday that only returns seconds.
  */
diff --git a/lib/roken/swab.c b/lib/roken/swab.c
index 3ba132a74..eb11ba833 100644
--- a/lib/roken/swab.c
+++ b/lib/roken/swab.c
@@ -36,12 +36,12 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id$");
-#endif
+#include "roken.h"
 
 #ifndef HAVE_SWAB
+
+RCSID("$Id$");
+
 void
 swab (char *from, char *to, int nbytes)
 {