diff --git a/lib/zip_algorithm_zstd.c b/lib/zip_algorithm_zstd.c
index 3272956..3b7ac79 100644
--- a/lib/zip_algorithm_zstd.c
+++ b/lib/zip_algorithm_zstd.c
@@ -257,12 +257,12 @@
     return ZIP_COMPRESSION_OK;
 }
 
-/* clang-format off */
-
 /* Version Required should be set to 63 (6.3) because this compression
    method was only defined in appnote.txt version 6.3.7, but Winzip
    does not unpack it if the value is not 20. */
 
+/* clang-format off */
+
 zip_compression_algorithm_t zip_algorithm_zstd_compress = {
     maximum_compressed_size,
     compress_allocate,
diff --git a/lib/zip_source_file_win32.c b/lib/zip_source_file_win32.c
index 2fe838f..0ccb9f1 100644
--- a/lib/zip_source_file_win32.c
+++ b/lib/zip_source_file_win32.c
@@ -37,6 +37,8 @@
 
 static bool _zip_stat_win32(zip_source_file_context_t *ctx, zip_source_file_stat_t *st, HANDLE h);
 
+/* clang-format off */
+
 static zip_source_file_operations_t ops_win32_read = {
     _zip_win32_op_close,
     NULL,
@@ -53,6 +55,7 @@
     NULL
 };
 
+/* clang-format on */
 
 ZIP_EXTERN zip_source_t *
 zip_source_win32handle(zip_t *za, HANDLE h, zip_uint64_t start, zip_int64_t len) {
diff --git a/lib/zip_source_file_win32_ansi.c b/lib/zip_source_file_win32_ansi.c
index 573b74e..9201515 100644
--- a/lib/zip_source_file_win32_ansi.c
+++ b/lib/zip_source_file_win32_ansi.c
@@ -36,6 +36,8 @@
 static char *ansi_allocate_tempname(const char *name, size_t extra_chars, size_t *lengthp);
 static void ansi_make_tempname(char *buf, size_t len, const char *name, zip_uint32_t i);
 
+/* clang-format off */
+
 zip_win32_file_operations_t ops_ansi = {
     ansi_allocate_tempname,
     CreateFileA,
@@ -48,6 +50,8 @@
     strdup
 };
 
+/* clang-format on */
+
 ZIP_EXTERN zip_source_t *
 zip_source_win32a(zip_t *za, const char *fname, zip_uint64_t start, zip_int64_t len) {
     if (za == NULL)
diff --git a/lib/zip_source_file_win32_utf16.c b/lib/zip_source_file_win32_utf16.c
index 3fa0aa1..993b154 100644
--- a/lib/zip_source_file_win32_utf16.c
+++ b/lib/zip_source_file_win32_utf16.c
@@ -38,6 +38,8 @@
 static void utf16_make_tempname(char *buf, size_t len, const char *name, zip_uint32_t i);
 static char *utf16_strdup(const char *string);
 
+/* clang-format off */
+
 zip_win32_file_operations_t ops_utf16 = {
     utf16_allocate_tempname,
     utf16_create_file,
@@ -50,6 +52,8 @@
     utf16_strdup
 };
 
+/* clang-format on */
+
 ZIP_EXTERN zip_source_t *
 zip_source_win32w(zip_t *za, const wchar_t *fname, zip_uint64_t start, zip_int64_t len) {
     if (za == NULL)
diff --git a/lib/zipint.h b/lib/zipint.h
index 5dce83a..b37beba 100644
--- a/lib/zipint.h
+++ b/lib/zipint.h
@@ -35,6 +35,7 @@
 */
 
 #include "config.h"
+
 #include "compat.h"
 
 #ifdef ZIP_ALLOCATE_BUFFER
diff --git a/regress/ziptool_regress.c b/regress/ziptool_regress.c
index ce51fbd..713b44e 100644
--- a/regress/ziptool_regress.c
+++ b/regress/ziptool_regress.c
@@ -31,12 +31,16 @@
 	fragment_size = strtoull(optarg, NULL, 10); \
 	break;
 
+/* clang-format off */
+
 #define DISPATCH_REGRESS \
     {"add_nul", 2, "name length", "add NUL bytes", add_nul}, \
     {"cancel", 1, "limit", "cancel writing archive when limit% have been written (calls print_progress)", cancel}, \
     {"unchange_all", 0, "", "revert all changes", unchange_all}, \
     { "zin_close", 1, "index", "close input zip_source (for internal tests)", zin_close }
 
+/* clang-format on */
+
 
 zip_t *ziptool_open(const char *archive, int flags, zip_error_t *error, zip_uint64_t offset, zip_uint64_t len);