3 files changed, 18 insertions, 14 deletions
diff --git a/misc/error.c b/misc/error.c
index 49c772dbb5..82de13777e 100644
--- a/misc/error.c
+++ b/misc/error.c
@@ -88,7 +88,7 @@ private_strerror (errnum)
   extern int sys_nerr;
 
   if (errnum > 0 && errnum <= sys_nerr)
-    return sys_errlist[errnum];
+    return _(sys_errlist[errnum]);
   return _("Unknown system error");
 }
 #define strerror private_strerror
diff --git a/misc/fstab.h b/misc/fstab.h
index 2a176bdb83..d45ce62d2b 100644
--- a/misc/fstab.h
+++ b/misc/fstab.h
@@ -34,7 +34,9 @@
  */
 
 #ifndef _FSTAB_H_
-#define _FSTAB_H_
+
+#define _FSTAB_H_	1
+#include <features.h>
 
 /*
  * File system table, see fstab(5).
@@ -66,14 +68,15 @@ struct fstab {
 	int	fs_passno;		/* pass number on parallel dump */
 };
 
-#include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct fstab *getfsent __P((void));
-struct fstab *getfsspec __P((const char *));
-struct fstab *getfsfile __P((const char *));
-int setfsent __P((void));
-void endfsent __P((void));
+
+extern struct fstab *getfsent __P ((void));
+extern struct fstab *getfsspec __P ((__const char *__name));
+extern struct fstab *getfsfile __P ((__const char *__name));
+extern int setfsent __P ((void));
+extern void endfsent __P ((void));
+
 __END_DECLS
 
 #endif /* !_FSTAB_H_ */
diff --git a/misc/ttyent.h b/misc/ttyent.h
index fb3f952e04..a3b4550776 100644
--- a/misc/ttyent.h
+++ b/misc/ttyent.h
@@ -34,7 +34,9 @@
  */
 
 #ifndef	_TTYENT_H_
-#define	_TTYENT_H_
+
+#define	_TTYENT_H_	1
+#include <features.h>
 
 #define	_PATH_TTYS	"/etc/ttys"
 
@@ -54,14 +56,13 @@ struct ttyent {
 	char	*ty_comment;	/* comment field */
 };
 
-#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 
-struct ttyent *getttyent __P ((void));
-struct ttyent *getttynam __P ((__const char *));
-int setttyent __P ((void));
-int endttyent __P ((void));
+extern struct ttyent *getttyent __P ((void));
+extern struct ttyent *getttynam __P ((__const char *__tty));
+extern int setttyent __P ((void));
+extern int endttyent __P ((void));
 
 __END_DECLS