diff --git a/libselinux/man/man3/selabel_stats.3 b/libselinux/man/man3/selabel_stats.3
index 441f4224..d39accce 100644
--- a/libselinux/man/man3/selabel_stats.3
+++ b/libselinux/man/man3/selabel_stats.3
@@ -9,7 +9,7 @@ selabel_stats \- obtain SELinux labeling statistics.
 
 .B #include <selinux/label.h>
 .sp
-.BI "void selabel_lookup(struct selabel_handle *" hnd ");"
+.BI "void selabel_stats(struct selabel_handle *" hnd ");"
 
 .SH "DESCRIPTION"
 .B selabel_stats
diff --git a/libselinux/man/man3/selinux_binary_policy_path.3 b/libselinux/man/man3/selinux_binary_policy_path.3
index 8ead1a44..b4f6590f 100644
--- a/libselinux/man/man3/selinux_binary_policy_path.3
+++ b/libselinux/man/man3/selinux_binary_policy_path.3
@@ -11,35 +11,35 @@ directories and files.
 .B #include <selinux/selinux.h>
 .sp
 
-extern const char *selinux_path(void);
+const char *selinux_path(void);
 
-extern const char *selinux_policy_root(void);
+const char *selinux_policy_root(void);
 
-extern const char *selinux_binary_policy_path(void);
+const char *selinux_binary_policy_path(void);
 
-extern const char *selinux_failsafe_context_path(void);
+const char *selinux_failsafe_context_path(void);
 
-extern const char *selinux_removable_context_path(void);
+const char *selinux_removable_context_path(void);
 
-extern const char *selinux_default_context_path(void);
+const char *selinux_default_context_path(void);
 
-extern const char *selinux_user_contexts_path(void);
+const char *selinux_user_contexts_path(void);
 
-extern const char *selinux_usersconf_path(void);
+const char *selinux_usersconf_path(void);
 
-extern const char *selinux_x_context_path(void);
+const char *selinux_x_context_path(void);
 
-extern const char *selinux_sepgsql_context_path(void);
+const char *selinux_sepgsql_context_path(void);
 
-extern const char *selinux_file_context_path(void);
+const char *selinux_file_context_path(void);
 
-extern const char *selinux_media_context_path(void);
+const char *selinux_media_context_path(void);
 
-extern const char *selinux_securetty_types_path(void);
+const char *selinux_securetty_types_path(void);
 
-extern const char *selinux_contexts_path(void);
+const char *selinux_contexts_path(void);
 
-extern const char *selinux_booleans_path(void);
+const char *selinux_booleans_path(void);
 
 
 .SH "DESCRIPTION"
diff --git a/libselinux/man/man3/selinux_boolean_sub.3 b/libselinux/man/man3/selinux_boolean_sub.3
index 8d54c882..8693d573 100644
--- a/libselinux/man/man3/selinux_boolean_sub.3
+++ b/libselinux/man/man3/selinux_boolean_sub.3
@@ -1,10 +1,10 @@
-.TH "selinux_boolean_subs" "3" "11 June 2012" "dwalsh@redhat.com" "SELinux API documentation"
+.TH "selinux_boolean_sub" "3" "11 June 2012" "dwalsh@redhat.com" "SELinux API documentation"
 .SH "NAME"
-selinux_boolean_subs
+selinux_boolean_sub
 .SH "SYNOPSIS"
 .B #include <selinux/selinux.h>
 .sp
-.BI "char *selinux_boolean_subs(const char * " boolean_name, ");"
+.BI "char *selinux_boolean_sub(const char * " boolean_name ");"
 .sp
 .SH "DESCRIPTION"
 .B selinux_boolean_sub
@@ -14,12 +14,12 @@ for a maching boolean_name record.  If the record exists the boolean substitutio
 returns the original boolean_name.
 
 .SH "RETURN VALUE"
-.BR selinux_boolean_subs
+.BR selinux_boolean_sub
 returns the
 .I boolean_name
 or the substituted name on success.  The returned value must be freed with
 .BR free "(3)."
-.BR selinux_boolean_subs
+.BR selinux_boolean_sub
 returns NULL on error.
 .SH "SEE ALSO"
 security_get_boolean_names.3
diff --git a/libselinux/man/man3/selinux_getpolicytype.3 b/libselinux/man/man3/selinux_getpolicytype.3
index 67f95181..b93e66e6 100644
--- a/libselinux/man/man3/selinux_getpolicytype.3
+++ b/libselinux/man/man3/selinux_getpolicytype.3
@@ -4,7 +4,7 @@ selinux_getpolicytype \- get the type of SELinux policy running on the system
 .SH "SYNOPSIS"
 .B #include <selinux/selinux.h>
 .sp
-.B int selinux_getpolicytype();
+.BI "int selinux_getpolicytype(char **" policytype );
 
 
 .SH "DESCRIPTION"
diff --git a/libselinux/man/man3/selinux_policy_root.3 b/libselinux/man/man3/selinux_policy_root.3
index 7499c750..c69e16ed 100644
--- a/libselinux/man/man3/selinux_policy_root.3
+++ b/libselinux/man/man3/selinux_policy_root.3
@@ -4,7 +4,7 @@ selinux_policy_root \- return the path of the SELinux policy files for this mach
 .SH "SYNOPSIS"
 .B #include <selinux/selinux.h>
 .sp
-.B char *selinux_policy_root();
+.B const char *selinux_policy_root(void);
 
 
 .SH "DESCRIPTION"
diff --git a/libselinux/man/man3/selinux_status_open.3 b/libselinux/man/man3/selinux_status_open.3
index e897939e..9cb9249b 100644
--- a/libselinux/man/man3/selinux_status_open.3
+++ b/libselinux/man/man3/selinux_status_open.3
@@ -7,7 +7,7 @@ without invocation of system calls.
 .SH "SYNOPSIS"
 .B #include <selinux/avc.h>
 .sp
-.BI "int selinux_status_open(int " fallback, ");"
+.BI "int selinux_status_open(int " fallback ");"
 .sp
 .BI "void selinux_status_close(void);"
 .sp
diff --git a/libselinux/man/man5/selabel_db.5 b/libselinux/man/man5/selabel_db.5
index c809d181..6de8b5f0 100644
--- a/libselinux/man/man5/selabel_db.5
+++ b/libselinux/man/man5/selabel_db.5
@@ -5,7 +5,7 @@
 .SH "NAME"
 selabel_db \- userspace SELinux labeling interface and configuration file format for the RDBMS objects context backend.
 .SH "SYNOPSIS"
-..B #include <selinux/label.h>
+.B #include <selinux/label.h>
 .sp
 .BI "int selabel_lookup(struct selabel_handle *" hnd ,
 .in +\w'int selabel_lookup('u
diff --git a/libselinux/man/man8/selinuxexeccon.8 b/libselinux/man/man8/selinuxexeccon.8
index 6482d746..ebc5f4a4 100644
--- a/libselinux/man/man8/selinuxexeccon.8
+++ b/libselinux/man/man8/selinuxexeccon.8
@@ -3,7 +3,7 @@
 selinuxexeccon \- report SELinux context used for this executable
 
 .SH "SYNOPSIS"
-.B selinuxexeccon command [ fromcon] o
+.B selinuxexeccon command [ fromcon]
 
 .SH "DESCRIPTION"
 .B selinuxexeccon