Use zip_XXX_t instead of struct zip_XXX or enum zip_XXX.
diff --git a/man/zip_add.mdoc b/man/zip_add.mdoc
index 13916c7..3430081 100644
--- a/man/zip_add.mdoc
+++ b/man/zip_add.mdoc
@@ -41,11 +41,11 @@
.Sh SYNOPSIS
.In zip.h
.Ft zip_int64_t
-.Fn zip_add "struct zip *archive" "const char *name" \
-"struct zip_source *source"
+.Fn zip_add "zip_t *archive" "const char *name" \
+"zip_source_t *source"
.Ft int
-.Fn zip_replace "struct zip *archive" "zip_uint64_t index" \
-"struct zip_source *source"
+.Fn zip_replace "zip_t *archive" "zip_uint64_t index" \
+"zip_source_t *source"
.Sh DESCRIPTION
The function
.Fn zip_add
diff --git a/man/zip_add_dir.mdoc b/man/zip_add_dir.mdoc
index 12a79fd..9430a8a 100644
--- a/man/zip_add_dir.mdoc
+++ b/man/zip_add_dir.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft zip_int64_t
-.Fn zip_add_dir "struct zip *archive" "const char *name"
+.Fn zip_add_dir "zip_t *archive" "const char *name"
.Sh DESCRIPTION
The function
.Fn zip_add_dir
diff --git a/man/zip_close.mdoc b/man/zip_close.mdoc
index 8754e63..4d3eac0 100644
--- a/man/zip_close.mdoc
+++ b/man/zip_close.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_close "struct zip *archive"
+.Fn zip_close "zip_t *archive"
.Sh DESCRIPTION
The
.Fn zip_close
diff --git a/man/zip_delete.mdoc b/man/zip_delete.mdoc
index 24f1431..9e86b16 100644
--- a/man/zip_delete.mdoc
+++ b/man/zip_delete.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_delete "struct zip *archive" "zip_uint64_t index"
+.Fn zip_delete "zip_t *archive" "zip_uint64_t index"
.Sh DESCRIPTION
The file at position
.Ar index
diff --git a/man/zip_dir_add.mdoc b/man/zip_dir_add.mdoc
index bfc57ca..c583300 100644
--- a/man/zip_dir_add.mdoc
+++ b/man/zip_dir_add.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft zip_int64_t
-.Fn zip_dir_add "struct zip *archive" "const char *name" \
+.Fn zip_dir_add "zip_t *archive" "const char *name" \
"zip_flags_t flags"
.Sh DESCRIPTION
The function
diff --git a/man/zip_discard.mdoc b/man/zip_discard.mdoc
index b2250c1..8ba175e 100644
--- a/man/zip_discard.mdoc
+++ b/man/zip_discard.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft void
-.Fn zip_discard "struct zip *archive"
+.Fn zip_discard "zip_t *archive"
.Sh DESCRIPTION
The
.Fn zip_discard
diff --git a/man/zip_error_clear.mdoc b/man/zip_error_clear.mdoc
index 918164e..0a808ce 100644
--- a/man/zip_error_clear.mdoc
+++ b/man/zip_error_clear.mdoc
@@ -41,9 +41,9 @@
.Sh SYNOPSIS
.In zip.h
.Ft void
-.Fn zip_error_clear "struct zip *archive"
+.Fn zip_error_clear "zip_t *archive"
.Ft void
-.Fn zip_file_error_clear "struct zip_file *file"
+.Fn zip_file_error_clear "zip_file_t *file"
.Sh DESCRIPTION
The
.Fn zip_error_clear
diff --git a/man/zip_error_get.mdoc b/man/zip_error_get.mdoc
index e1711bd..91dae82 100644
--- a/man/zip_error_get.mdoc
+++ b/man/zip_error_get.mdoc
@@ -41,9 +41,9 @@
.Sh SYNOPSIS
.In zip.h
.Ft void
-.Fn zip_error_get "struct zip *archive" "int *zep" "int *sep"
+.Fn zip_error_get "zip_t *archive" "int *zep" "int *sep"
.Ft void
-.Fn zip_file_error_get "struct zip_file *file" "int *zep" "int *sep"
+.Fn zip_file_error_get "zip_file_t *file" "int *zep" "int *sep"
.Sh DESCRIPTION
The
.Fn zip_error_get
diff --git a/man/zip_fclose.mdoc b/man/zip_fclose.mdoc
index 2e3350b..553db4c 100644
--- a/man/zip_fclose.mdoc
+++ b/man/zip_fclose.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_fclose "struct zip_file *file"
+.Fn zip_fclose "zip_file_t *file"
.Sh DESCRIPTION
The
.Fn zip_fclose
diff --git a/man/zip_fdopen.mdoc b/man/zip_fdopen.mdoc
index b49d361..19a4751 100644
--- a/man/zip_fdopen.mdoc
+++ b/man/zip_fdopen.mdoc
@@ -39,7 +39,7 @@
libzip (-lzip)
.Sh SYNOPSIS
.In zip.h
-.Ft struct zip *
+.Ft zip_t *
.Fn zip_fdopen "int fd" "int flags" "int *errorp"
.Sh DESCRIPTION
The zip archive specified by the open file descriptor
diff --git a/man/zip_file_add.mdoc b/man/zip_file_add.mdoc
index c653258..0b1a47d 100644
--- a/man/zip_file_add.mdoc
+++ b/man/zip_file_add.mdoc
@@ -41,11 +41,11 @@
.Sh SYNOPSIS
.In zip.h
.Ft zip_int64_t
-.Fn zip_file_add "struct zip *archive" "const char *name" \
-"struct zip_source *source" "zip_flags_t flags"
+.Fn zip_file_add "zip_t *archive" "const char *name" \
+"zip_source_t *source" "zip_flags_t flags"
.Ft int
-.Fn zip_file_replace "struct zip *archive" "zip_uint64_t index" \
-"struct zip_source *source" "zip_flags_t flags"
+.Fn zip_file_replace "zip_t *archive" "zip_uint64_t index" \
+"zip_source_t *source" "zip_flags_t flags"
.Sh DESCRIPTION
The function
.Fn zip_file_add
@@ -102,7 +102,7 @@
is set to indicate the error.
.Sh EXAMPLES
.Bd -literal -offset indent
-struct zip_source *s;
+zip_source_t *s;
const char buf="teststring";
if ((s=zip_source_buffer(archive, buffer, sizeof(buf), 0)) == NULL ||
diff --git a/man/zip_file_extra_field_delete.mdoc b/man/zip_file_extra_field_delete.mdoc
index 2581355..c39a54f 100644
--- a/man/zip_file_extra_field_delete.mdoc
+++ b/man/zip_file_extra_field_delete.mdoc
@@ -41,10 +41,10 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_file_extra_field_delete "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_file_extra_field_delete "zip_t *archive" "zip_uint64_t index" \
"zip_uint16_t extra_field_index" "zip_flags_t flags"
.Ft int
-.Fn zip_file_extra_field_delete_by_id "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_file_extra_field_delete_by_id "zip_t *archive" "zip_uint64_t index" \
"zip_uint16_t extra_field_id" "zip_uint16_t extra_field_index" "zip_flags_t flags"
.Sh DESCRIPTION
The
diff --git a/man/zip_file_extra_field_get.mdoc b/man/zip_file_extra_field_get.mdoc
index d8a32f3..64f50c3 100644
--- a/man/zip_file_extra_field_get.mdoc
+++ b/man/zip_file_extra_field_get.mdoc
@@ -41,11 +41,11 @@
.Sh SYNOPSIS
.In zip.h
.Ft const zip_uint8_t *
-.Fn zip_file_extra_field_get "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_file_extra_field_get "zip_t *archive" "zip_uint64_t index" \
"zip_uint16_t extra_field_index" "zip_uint16_t *idp" "zip_uint16_t *lenp" \
"zip_flags_t flags"
.Ft const zip_uint8_t *
-.Fn zip_file_extra_field_get_by_id "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_file_extra_field_get_by_id "zip_t *archive" "zip_uint64_t index" \
"zip_uint16_t extra_field_id" "zip_uint16_t extra_field_index" "zip_uint16_t *lenp" \
"zip_flags_t flags"
.Sh DESCRIPTION
diff --git a/man/zip_file_extra_field_set.mdoc b/man/zip_file_extra_field_set.mdoc
index 47cb3ba..c49dc8c 100644
--- a/man/zip_file_extra_field_set.mdoc
+++ b/man/zip_file_extra_field_set.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_file_extra_field_set "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_file_extra_field_set "zip_t *archive" "zip_uint64_t index" \
"zip_uint16_t extra_field_id" "zip_uint16_t extra_field_index" \
"const zip_uint8_t *extra_field_data" "zip_uint16_t len" \
"zip_flags_t flags"
diff --git a/man/zip_file_extra_fields_count.mdoc b/man/zip_file_extra_fields_count.mdoc
index 00db3a6..3fe437b 100644
--- a/man/zip_file_extra_fields_count.mdoc
+++ b/man/zip_file_extra_fields_count.mdoc
@@ -41,10 +41,10 @@
.Sh SYNOPSIS
.In zip.h
.Ft zip_int16_t
-.Fn zip_file_extra_fields_count "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_file_extra_fields_count "zip_t *archive" "zip_uint64_t index" \
"zip_flags_t flags"
.Ft zip_int16_t
-.Fn zip_file_extra_fields_count_by_id "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_file_extra_fields_count_by_id "zip_t *archive" "zip_uint64_t index" \
"zip_uint16_t extra_field_id" "zip_flags_t flags"
.Sh DESCRIPTION
The
diff --git a/man/zip_file_get_comment.mdoc b/man/zip_file_get_comment.mdoc
index 4193a22..ed9b8c2 100644
--- a/man/zip_file_get_comment.mdoc
+++ b/man/zip_file_get_comment.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft const char *
-.Fn zip_file_get_comment "struct zip *archive" "zip_uint64_t index" "zip_uint32_t *lenp" \
+.Fn zip_file_get_comment "zip_t *archive" "zip_uint64_t index" "zip_uint32_t *lenp" \
"zip_flags_t flags"
.Sh DESCRIPTION
The
diff --git a/man/zip_file_get_external_attributes.mdoc b/man/zip_file_get_external_attributes.mdoc
index 4a3235a..1f43613 100644
--- a/man/zip_file_get_external_attributes.mdoc
+++ b/man/zip_file_get_external_attributes.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft const char *
-.Fn zip_file_get_external_attributes "struct zip *archive" "zip_uint64_t index" "zip_flags_t flags" \
+.Fn zip_file_get_external_attributes "zip_t *archive" "zip_uint64_t index" "zip_flags_t flags" \
"zip_uint8_t *opsys" "zip_uint32_t *attributes"
.Sh DESCRIPTION
The
diff --git a/man/zip_file_rename.mdoc b/man/zip_file_rename.mdoc
index d296dfe..d4f7872 100644
--- a/man/zip_file_rename.mdoc
+++ b/man/zip_file_rename.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_file_rename "struct zip *archive" "zip_uint64_t index" "const char *name" \
+.Fn zip_file_rename "zip_t *archive" "zip_uint64_t index" "const char *name" \
"zip_flags_t flags"
.Sh DESCRIPTION
The file at position
diff --git a/man/zip_file_set_comment.mdoc b/man/zip_file_set_comment.mdoc
index bdd083a..ea61009 100644
--- a/man/zip_file_set_comment.mdoc
+++ b/man/zip_file_set_comment.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_set_file_comment "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_set_file_comment "zip_t *archive" "zip_uint64_t index" \
"const char *comment" "zip_uint16_t len" "zip_flags_t flags"
.Sh DESCRIPTION
The
diff --git a/man/zip_file_set_external_attributes.mdoc b/man/zip_file_set_external_attributes.mdoc
index a3d6b83..ad6c117 100644
--- a/man/zip_file_set_external_attributes.mdoc
+++ b/man/zip_file_set_external_attributes.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft const char *
-.Fn zip_file_set_external_attributes "struct zip *archive" "zip_uint64_t index" "zip_flags_t flags" \
+.Fn zip_file_set_external_attributes "zip_t *archive" "zip_uint64_t index" "zip_flags_t flags" \
"zip_uint8_t opsys" "zip_uint32_t attributes"
.Sh DESCRIPTION
The
diff --git a/man/zip_file_set_mtime.mdoc b/man/zip_file_set_mtime.mdoc
index ac435eb..82ae600 100644
--- a/man/zip_file_set_mtime.mdoc
+++ b/man/zip_file_set_mtime.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_set_file_mtime "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_set_file_mtime "zip_t *archive" "zip_uint64_t index" \
"time_t mtime" "zip_flags_t flags"
.Sh DESCRIPTION
The
diff --git a/man/zip_file_strerror.mdoc b/man/zip_file_strerror.mdoc
index 281168f..5ea739f 100644
--- a/man/zip_file_strerror.mdoc
+++ b/man/zip_file_strerror.mdoc
@@ -41,9 +41,9 @@
.Sh SYNOPSIS
.In zip.h
.Ft const char *
-.Fn zip_file_strerror "struct zip_file *file"
+.Fn zip_file_strerror "zip_file_t *file"
.Ft const char *
-.Fn zip_strerror "struct zip *archive"
+.Fn zip_strerror "zip_t *archive"
.Sh DESCRIPTION
The
.Fn zip_strerror
diff --git a/man/zip_fopen.mdoc b/man/zip_fopen.mdoc
index 354aa92..1b7401b 100644
--- a/man/zip_fopen.mdoc
+++ b/man/zip_fopen.mdoc
@@ -40,10 +40,10 @@
libzip (-lzip)
.Sh SYNOPSIS
.In zip.h
-.Ft struct zip_file *
-.Fn zip_fopen "struct zip *archive" "const char *fname" "zip_flags_t flags"
-.Ft struct zip_file *
-.Fn zip_fopen_index "struct zip *archive" "zip_uint64_t index" "zip_flags_t flags"
+.Ft zip_file_t *
+.Fn zip_fopen "zip_t *archive" "const char *fname" "zip_flags_t flags"
+.Ft zip_file_t *
+.Fn zip_fopen_index "zip_t *archive" "zip_uint64_t index" "zip_flags_t flags"
.Sh DESCRIPTION
The
.Fn zip_fopen
diff --git a/man/zip_fopen_encrypted.mdoc b/man/zip_fopen_encrypted.mdoc
index b1c44f6..67789f2 100644
--- a/man/zip_fopen_encrypted.mdoc
+++ b/man/zip_fopen_encrypted.mdoc
@@ -40,10 +40,10 @@
libzip (-lzip)
.Sh SYNOPSIS
.In zip.h
-.Ft struct zip_file *
-.Fn zip_fopen_encrypted "struct zip *archive" "const char *fname" "zip_flags_t flags" "const char *password"
-.Ft struct zip_file *
-.Fn zip_fopen_index_encrypted "struct zip *archive" "zip_uint64_t index" "zip_flags_t flags" "const char *password"
+.Ft zip_file_t *
+.Fn zip_fopen_encrypted "zip_t *archive" "const char *fname" "zip_flags_t flags" "const char *password"
+.Ft zip_file_t *
+.Fn zip_fopen_index_encrypted "zip_t *archive" "zip_uint64_t index" "zip_flags_t flags" "const char *password"
.Sh DESCRIPTION
The
.Fn zip_fopen_encrypted
diff --git a/man/zip_fread.mdoc b/man/zip_fread.mdoc
index 48ad5bb..b7a8975 100644
--- a/man/zip_fread.mdoc
+++ b/man/zip_fread.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_fread "struct zip_file *file" "void *buf" "zip_uint64_t nbytes"
+.Fn zip_fread "zip_file_t *file" "void *buf" "zip_uint64_t nbytes"
.Sh DESCRIPTION
The
.Fn zip_fread
diff --git a/man/zip_get_archive_comment.mdoc b/man/zip_get_archive_comment.mdoc
index 2dcc207..1cbb23e 100644
--- a/man/zip_get_archive_comment.mdoc
+++ b/man/zip_get_archive_comment.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft const char *
-.Fn zip_get_archive_comment "struct zip *archive" "int *lenp" "zip_flags_t flags"
+.Fn zip_get_archive_comment "zip_t *archive" "int *lenp" "zip_flags_t flags"
.Sh DESCRIPTION
The
.Fn zip_get_archive_comment
diff --git a/man/zip_get_archive_flag.mdoc b/man/zip_get_archive_flag.mdoc
index c8bb57e..546c52f 100644
--- a/man/zip_get_archive_flag.mdoc
+++ b/man/zip_get_archive_flag.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_get_archive_flag "struct zip *archive" "zip_flags_t flag" "zip_flags_t flags"
+.Fn zip_get_archive_flag "zip_t *archive" "zip_flags_t flag" "zip_flags_t flags"
.Sh DESCRIPTION
The
.Fn zip_get_archive_flag
diff --git a/man/zip_get_file_comment.mdoc b/man/zip_get_file_comment.mdoc
index c9dac02..022cbf8 100644
--- a/man/zip_get_file_comment.mdoc
+++ b/man/zip_get_file_comment.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft const char *
-.Fn zip_get_file_comment "struct zip *archive" "zip_uint64_t index" "int *lenp" "int flags"
+.Fn zip_get_file_comment "zip_t *archive" "zip_uint64_t index" "int *lenp" "int flags"
.Sh DESCRIPTION
The
.Fn zip_get_file_comment
diff --git a/man/zip_get_name.mdoc b/man/zip_get_name.mdoc
index 33227b1..6184793 100644
--- a/man/zip_get_name.mdoc
+++ b/man/zip_get_name.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft const char *
-.Fn zip_get_name "struct zip *archive" "zip_uint64_t index" "zip_flags_t flags"
+.Fn zip_get_name "zip_t *archive" "zip_uint64_t index" "zip_flags_t flags"
.Sh DESCRIPTION
The
.Fn zip_get_name
diff --git a/man/zip_get_num_entries.mdoc b/man/zip_get_num_entries.mdoc
index 753e9f0..f6c78e1 100644
--- a/man/zip_get_num_entries.mdoc
+++ b/man/zip_get_num_entries.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft zip_int64_t
-.Fn zip_get_num_entries "struct zip *archive" "zip_flags_t flags"
+.Fn zip_get_num_entries "zip_t *archive" "zip_flags_t flags"
.Sh DESCRIPTION
The
.Fn zip_get_num_entries
diff --git a/man/zip_get_num_files.mdoc b/man/zip_get_num_files.mdoc
index 3a65c83..09b0c4e 100644
--- a/man/zip_get_num_files.mdoc
+++ b/man/zip_get_num_files.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_get_num_files "struct zip *archive"
+.Fn zip_get_num_files "zip_t *archive"
.Sh DESCRIPTION
.Em This function is deprecated.
.Em Use
diff --git a/man/zip_name_locate.mdoc b/man/zip_name_locate.mdoc
index 0c38a0f..51e4432 100644
--- a/man/zip_name_locate.mdoc
+++ b/man/zip_name_locate.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft zip_int64_t
-.Fn zip_name_locate "struct zip *archive" "const char *fname" "zip_flags_t flags"
+.Fn zip_name_locate "zip_t *archive" "const char *fname" "zip_flags_t flags"
.Sh DESCRIPTION
The
.Fn zip_name_locate
diff --git a/man/zip_open.mdoc b/man/zip_open.mdoc
index f805da0..740be21 100644
--- a/man/zip_open.mdoc
+++ b/man/zip_open.mdoc
@@ -39,7 +39,7 @@
libzip (-lzip)
.Sh SYNOPSIS
.In zip.h
-.Ft struct zip *
+.Ft zip_t *
.Fn zip_open "const char *path" "int flags" "int *errorp"
.Sh DESCRIPTION
The zip archive specified by
diff --git a/man/zip_rename.mdoc b/man/zip_rename.mdoc
index 96b2610..1500aa5 100644
--- a/man/zip_rename.mdoc
+++ b/man/zip_rename.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_rename "struct zip *archive" "zip_uint64_t index" "const char *name"
+.Fn zip_rename "zip_t *archive" "zip_uint64_t index" "const char *name"
.Sh DESCRIPTION
.Fn zip_rename
is the obsolete version of
diff --git a/man/zip_set_archive_comment.mdoc b/man/zip_set_archive_comment.mdoc
index 9ebaa5b..15425f8 100644
--- a/man/zip_set_archive_comment.mdoc
+++ b/man/zip_set_archive_comment.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_set_archive_comment "struct zip *archive" \
+.Fn zip_set_archive_comment "zip_t *archive" \
"const char *comment" "zip_uint16_t len"
.Sh DESCRIPTION
The
diff --git a/man/zip_set_archive_flag.mdoc b/man/zip_set_archive_flag.mdoc
index ee4f62b..349f85c 100644
--- a/man/zip_set_archive_flag.mdoc
+++ b/man/zip_set_archive_flag.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_set_archive_flag "struct zip *archive" "zip_flags_t flag" "int value"
+.Fn zip_set_archive_flag "zip_t *archive" "zip_flags_t flag" "int value"
.Sh DESCRIPTION
The
.Fn zip_set_archive_flag
diff --git a/man/zip_set_default_password.mdoc b/man/zip_set_default_password.mdoc
index 234e545..214a7ac 100644
--- a/man/zip_set_default_password.mdoc
+++ b/man/zip_set_default_password.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_set_default_password "struct zip *archive" "const char *password"
+.Fn zip_set_default_password "zip_t *archive" "const char *password"
.Sh DESCRIPTION
The
.Fn zip_set_default_password
diff --git a/man/zip_set_file_comment.mdoc b/man/zip_set_file_comment.mdoc
index 8eeac0e..4291eef 100644
--- a/man/zip_set_file_comment.mdoc
+++ b/man/zip_set_file_comment.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_set_file_comment "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_set_file_comment "zip_t *archive" "zip_uint64_t index" \
"const char *comment" "int len"
.Sh DESCRIPTION
The
diff --git a/man/zip_set_file_compression.mdoc b/man/zip_set_file_compression.mdoc
index cff4373..f9f2326 100644
--- a/man/zip_set_file_compression.mdoc
+++ b/man/zip_set_file_compression.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_set_file_compression "struct zip *archive" "zip_uint64_t index" \
+.Fn zip_set_file_compression "zip_t *archive" "zip_uint64_t index" \
"zip_int32_t comp" "zip_uint32_t comp_flags"
.Sh DESCRIPTION
The
diff --git a/man/zip_source.mdoc b/man/zip_source.mdoc
index bb768a6..18146fd 100644
--- a/man/zip_source.mdoc
+++ b/man/zip_source.mdoc
@@ -39,7 +39,7 @@
libzip (-lzip)
.Sh SYNOPSIS
.In zip.h
-.Vt struct zip_source *zs ;
+.Vt zip_source_t *zs ;
.Sh DESCRIPTION
A
.Vt struct zip_source
diff --git a/man/zip_source_buffer.mdoc b/man/zip_source_buffer.mdoc
index cdd09de..0f5dfe3 100644
--- a/man/zip_source_buffer.mdoc
+++ b/man/zip_source_buffer.mdoc
@@ -39,8 +39,8 @@
libzip (-lzip)
.Sh SYNOPSIS
.In zip.h
-.Ft struct zip_source *
-.Fn zip_source_buffer "struct zip *archive" "const void *data" \
+.Ft zip_source_t *
+.Fn zip_source_buffer "zip_t *archive" "const void *data" \
"zip_uint64_t len" "int freep"
.Sh DESCRIPTION
The function
diff --git a/man/zip_source_file.mdoc b/man/zip_source_file.mdoc
index 5d13436..abcbb39 100644
--- a/man/zip_source_file.mdoc
+++ b/man/zip_source_file.mdoc
@@ -38,8 +38,8 @@
.Sh LIBRARY
libzip (-lzip)
.Sh SYNOPSIS
-.Ft struct zip_source *
-.Fn zip_source_file "struct zip *archive" "const char *fname" \
+.Ft zip_source_t *
+.Fn zip_source_file "zip_t *archive" "const char *fname" \
"zip_uint64_t start" "zip_int64_t len"
.Sh DESCRIPTION
The function
diff --git a/man/zip_source_filep.mdoc b/man/zip_source_filep.mdoc
index 4ca9a69..14c48d7 100644
--- a/man/zip_source_filep.mdoc
+++ b/man/zip_source_filep.mdoc
@@ -38,8 +38,8 @@
.Sh LIBRARY
libzip (-lzip)
.Sh SYNOPSIS
-.Ft struct zip_source *
-.Fn zip_source_filep "struct zip *archive" "FILE *file" \
+.Ft zip_source_t *
+.Fn zip_source_filep "zip_t *archive" "FILE *file" \
"zip_uint64_t start" "zip_int64_t len"
.Sh DESCRIPTION
The function
diff --git a/man/zip_source_free.mdoc b/man/zip_source_free.mdoc
index c264491..9bd411f 100644
--- a/man/zip_source_free.mdoc
+++ b/man/zip_source_free.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft void
-.Fn zip_source_free "struct zip_source *source"
+.Fn zip_source_free "zip_source_t *source"
.Sh DESCRIPTION
The function
.Fn zip_source_free
diff --git a/man/zip_source_function.mdoc b/man/zip_source_function.mdoc
index 4c52e72..69a201b 100644
--- a/man/zip_source_function.mdoc
+++ b/man/zip_source_function.mdoc
@@ -39,8 +39,8 @@
libzip (-lzip)
.Sh SYNOPSIS
.In zip.h
-.Ft struct zip_source *
-.Fn zip_source_function "struct zip *archive" "zip_source_callback fn" "void *userdata"
+.Ft zip_source_t *
+.Fn zip_source_function "zip_t *archive" "zip_source_callback fn" "void *userdata"
.Sh DESCRIPTION
The function
.Fn zip_source_function
@@ -49,7 +49,7 @@
which must be of the following type:
.Bd -literal
typedef zip_int64_t (*zip_source_callback)(void *state,
- void *data, zip_uint64_t len, enum zip_source_cmd cmd);
+ void *data, zip_uint64_t len, zip_source_cmd_t cmd);
.Ed
.Pp
.Ar archive
diff --git a/man/zip_source_zip.mdoc b/man/zip_source_zip.mdoc
index 9ccbb52..ce03220 100644
--- a/man/zip_source_zip.mdoc
+++ b/man/zip_source_zip.mdoc
@@ -39,8 +39,8 @@
libzip (-lzip)
.Sh SYNOPSIS
.In zip.h
-.Ft struct zip_source *
-.Fn zip_source_zip "struct zip *archive" "struct zip *srcarchive" \
+.Ft zip_source_t *
+.Fn zip_source_zip "zip_t *archive" "zip_t *srcarchive" \
"zip_uint64_t srcidx" "zip_flags_t flags" "zip_uint64_t start" "zip_int64_t len"
.Sh DESCRIPTION
The function
diff --git a/man/zip_stat.mdoc b/man/zip_stat.mdoc
index 6317479..a7ced3e 100644
--- a/man/zip_stat.mdoc
+++ b/man/zip_stat.mdoc
@@ -41,9 +41,9 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_stat "struct zip *archive" "const char *fname" "zip_flags_t flags" "struct zip_stat *sb"
+.Fn zip_stat "zip_t *archive" "const char *fname" "zip_flags_t flags" "zip_stat_t *sb"
.Ft int
-.Fn zip_stat_index "struct zip *archive" "int index" "zip_flags_t flags" "struct zip_stat *sb"
+.Fn zip_stat_index "zip_t *archive" "int index" "zip_flags_t flags" "zip_stat_t *sb"
.Sh DESCRIPTION
The
.Fn zip_stat
diff --git a/man/zip_stat_init.mdoc b/man/zip_stat_init.mdoc
index 488abea..3f37ee6 100644
--- a/man/zip_stat_init.mdoc
+++ b/man/zip_stat_init.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft void
-.Fn zip_stat_init "struct zip_stat *sb"
+.Fn zip_stat_init "zip_stat_t *sb"
.Sh DESCRIPTION
The
.Fn zip_stat_init
diff --git a/man/zip_unchange.mdoc b/man/zip_unchange.mdoc
index cda083f..792b4ed 100644
--- a/man/zip_unchange.mdoc
+++ b/man/zip_unchange.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_unchange "struct zip *archive" "int index"
+.Fn zip_unchange "zip_t *archive" "int index"
.Sh DESCRIPTION
Changes to the file at position
.Ar index
diff --git a/man/zip_unchange_all.mdoc b/man/zip_unchange_all.mdoc
index 1d47ead..33069b4 100644
--- a/man/zip_unchange_all.mdoc
+++ b/man/zip_unchange_all.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_unchange_all "struct zip *archive"
+.Fn zip_unchange_all "zip_t *archive"
.Sh DESCRIPTION
All changes to files and global information in
.Ar archive
diff --git a/man/zip_unchange_archive.mdoc b/man/zip_unchange_archive.mdoc
index 039d534..7aab5f5 100644
--- a/man/zip_unchange_archive.mdoc
+++ b/man/zip_unchange_archive.mdoc
@@ -40,7 +40,7 @@
.Sh SYNOPSIS
.In zip.h
.Ft int
-.Fn zip_unchange_archive "struct zip *archive"
+.Fn zip_unchange_archive "zip_t *archive"
.Sh DESCRIPTION
Revert all global changes to the archive
.Ar archive .
