diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index f8dae0df1..56776295b 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -353,21 +353,20 @@ void pidfile (const char*);
 #endif
 
 #ifndef HAVE_BSWAP32
-
 #ifndef HAVE_U_INT32_T
-typedef unsigned int u_int32_t;
-#endif
-
+unsigned int bswap32(unsigned int);
+#else
 u_int32_t bswap32(u_int32_t);
 #endif
+#endif
 
 #ifndef HAVE_BSWAP16
 #ifndef HAVE_U_INT16_T
-typedef unsigned short u_int16_t;
-#endif
-
+unsigned short bswap16(unsigned short);
+#else
 u_int16_t bswap16(u_int16_t);
 #endif
+#endif
 
 #ifndef HAVE_FLOCK
 #ifndef LOCK_SH