diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 92aefbdea..5c5da34b8 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -115,8 +115,6 @@ struct sockaddr_dl;
 #endif
 
 
-ROKEN_CPP_START
-
 #ifndef ROKEN_LIB_FUNCTION
 #if defined(__BORLANDC__)
 #define ROKEN_LIB_FUNCTION /* not-ready-definition-yet */
@@ -129,6 +127,8 @@ ROKEN_CPP_START
 
 #include <roken-common.h>
 
+ROKEN_CPP_START
+
 #ifndef HAVE___ATTRIBUTE__
 #define __attribute__(x)
 #endif
@@ -356,25 +356,6 @@ mkstemp(char *template);
 void pidfile (const char*);
 #endif
 
-#ifndef HAVE_STSVIS
-int strsvis(char *, const char*, int, const char *extra);
-#endif
-#ifndef HAVE_STRSVISX
-int strsvisx(char*, const char*, size_t, int, const char*);
-#endif
-#ifndef HAVE_STRVIS
-int strvis(char*, const char*, int);
-#endif
-#ifndef HAVE_STRVISX
-int strvisx(char*, const char*, size_t, int);
-#endif
-#ifndef HAVE_SVIS
-char *svis(char*, int, int, int, const char *);
-#endif
-#ifndef HAVE_VIS
-char *vis(char*, int, int, int);
-#endif
-
 #ifndef HAVE_FLOCK
 #ifndef LOCK_SH
 #define LOCK_SH   1		/* Shared lock */
@@ -613,4 +594,4 @@ struct hostent* roken_gethostbyaddr(const void*, size_t, int);
 void set_progname(char *argv0);
 const char *get_progname(void);
 
-_rk_cpp_end
+ROKEN_CPP_END