diff --git a/lib/crypto/crypto_compat.h b/lib/crypto/crypto_compat.h
index 669d863b..4a20850f 100644
--- a/lib/crypto/crypto_compat.h
+++ b/lib/crypto/crypto_compat.h
@@ -7,7 +7,7 @@
  * crypto_compat_RSA_valid_size(key):
  * Return nonzero if ${key} has a valid size, and zero for an invalid size.
  */
-int crypto_compat_RSA_valid_size(const RSA * const key);
+int crypto_compat_RSA_valid_size(const RSA * const);
 
 /**
  * crypto_compat_RSA_import(key, n, e, d, p, q, dmp1, dmq1, iqmp):
@@ -15,8 +15,8 @@ int crypto_compat_RSA_valid_size(const RSA * const key);
  * free any any BIGNUMs which have not been imported into the ${key}, but do
  * not free the ${key} itself.
  */
-int crypto_compat_RSA_import(RSA * key, BIGNUM * n, BIGNUM * e, BIGNUM * d,
-    BIGNUM * p, BIGNUM * q, BIGNUM * dmp1, BIGNUM * dmq1, BIGNUM * iqmp);
+int crypto_compat_RSA_import(RSA *, BIGNUM *, BIGNUM *, BIGNUM *,
+    BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *);
 
 /**
  * crypto_compat_RSA_export(key, n, e, d, p, q, dmp1, dmq1, iqmp):
@@ -24,9 +24,9 @@ int crypto_compat_RSA_import(RSA * key, BIGNUM * n, BIGNUM * e, BIGNUM * d,
  * must be non-NULL; the other values may be NULL if desired, and will
  * therefore not be exported.
  */
-int crypto_compat_RSA_export(RSA * key, const BIGNUM ** n, const BIGNUM ** e,
-    const BIGNUM ** d, const BIGNUM ** p, const BIGNUM ** q,
-    const BIGNUM ** dmp1, const BIGNUM ** dmq1, const BIGNUM ** iqmp);
+int crypto_compat_RSA_export(RSA *, const BIGNUM **, const BIGNUM **,
+    const BIGNUM **, const BIGNUM **, const BIGNUM **,
+    const BIGNUM **, const BIGNUM **, const BIGNUM **);
 
 /**
  * crypto_compat_RSA_generate_key(void):
diff --git a/lib/keyfile/keyfile.h b/lib/keyfile/keyfile.h
index ffbb0397..54ba5f5f 100644
--- a/lib/keyfile/keyfile.h
+++ b/lib/keyfile/keyfile.h
@@ -16,7 +16,7 @@
  * method to read the passphrase, using ${passphrase_arg} if applicable.
  */
 int keyfile_read(const char *, uint64_t *, int, int, enum passphrase_entry,
-    const char * passphrase_arg);
+    const char *);
 
 /**
  * keyfile_write(filename, machinenum, keys, passphrase, maxmem, cputime):
diff --git a/tar/chunks/chunks_internal.h b/tar/chunks/chunks_internal.h
index 5307e960..eb92cbb2 100644
--- a/tar/chunks/chunks_internal.h
+++ b/tar/chunks/chunks_internal.h
@@ -93,8 +93,7 @@ void chunks_stats_zero(struct chunkstats *);
  * Adjust ${stats} for the addition of ${copies} chunks each having length
  * ${len} and compressed length ${zlen}.
  */
-void chunks_stats_add(struct chunkstats *, size_t len, size_t zlen,
-    ssize_t copies);
+void chunks_stats_add(struct chunkstats *, size_t, size_t, ssize_t);
 
 /**
  * chunks_stats_addstats(to, from):
diff --git a/tar/glue/archive_multitape.h b/tar/glue/archive_multitape.h
index d7ace570..e5c568f4 100644
--- a/tar/glue/archive_multitape.h
+++ b/tar/glue/archive_multitape.h
@@ -26,8 +26,7 @@ void * archive_read_open_multitape(struct archive *, uint64_t, const char *);
  * Return a cookie which can be passed to the multitape layer.
  */
 void * archive_write_open_multitape(struct archive *, uint64_t, const char *,
-    const char *, int argc, char ** argv, int, int, time_t, const char *,
-    int *);
+    const char *, int, char **, int, int, time_t, const char *, int *);
 
 /**
  * archive_write_multitape_setmode(a, cookie, mode):