diff --git a/asm/assemble.c b/asm/assemble.c
index 7eab5ce12..bdc082b79 100644
--- a/asm/assemble.c
+++ b/asm/assemble.c
@@ -175,7 +175,6 @@
 
 #include "compiler.h"
 
-
 #include "nasm.h"
 #include "nasmlib.h"
 #include "error.h"
@@ -1059,7 +1058,6 @@ static void debug_set_type(insn *instruction)
     dfmt->debug_typevalue(typeinfo);
 }
 
-
 /* Proecess an EQU directive */
 static void define_equ(insn * instruction)
 {
@@ -1926,7 +1924,6 @@ static void gencode(struct out_data *data, insn *ins)
         opx = &ins->oprs[op1];
         opex = 0;                /* For the next iteration */
 
-
         switch (c) {
         case 01:
         case 02:
@@ -3388,7 +3385,7 @@ static void add_asp(insn *ins, int addrbits)
         ins->addr_size = addrbits;
     } else if (valid & ((addrbits == 32) ? 16 : 32)) {
         /* Add an address size prefix */
-        ins->prefixes[PPS_ASIZE] = (addrbits == 32) ? P_A16 : P_A32;;
+        ins->prefixes[PPS_ASIZE] = (addrbits == 32) ? P_A16 : P_A32;
         ins->addr_size = (addrbits == 32) ? 16 : 32;
     } else {
         /* Impossible... */
diff --git a/asm/assemble.h b/asm/assemble.h
index 507066268..754511be5 100644
--- a/asm/assemble.h
+++ b/asm/assemble.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2017 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/asm/directiv.c b/asm/directiv.c
index a4f54b4b8..2658202be 100644
--- a/asm/directiv.c
+++ b/asm/directiv.c
@@ -557,7 +557,6 @@ bool process_directives(char *directive)
         break;
     }
 
-
     /* A common error message */
     if (bad_param) {
         nasm_nonfatal("invalid parameter to [%s] directive", directive);
diff --git a/asm/error.c b/asm/error.c
index 192555de9..b4caf1656 100644
--- a/asm/error.c
+++ b/asm/error.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-
 #include "nasmlib.h"
 #include "error.h"
 
@@ -53,7 +52,6 @@
 	if ((_sev) >= ERR_FATAL)                                \
 		abort();
 
-
 void nasm_error(errflags severity, const char *fmt, ...)
 {
 	nasm_do_error(severity & ERR_MASK, severity & ~ERR_MASK);
@@ -97,7 +95,6 @@ fatal_func nasm_assert_failed(const char *file, int line, const char *msg)
 	nasm_panic("assertion %s failed at %s:%d", msg, file, line);
 }
 
-
 /*
  * Warning stack management. Note that there is an implicit "push"
  * after the command line has been parsed, but this particular push
@@ -147,7 +144,6 @@ void init_warnings(void)
 	warning_state_init = warning_stack;
 }
 
-
 /* Call after each pass */
 void reset_warnings(void)
 {
diff --git a/asm/eval.c b/asm/eval.c
index 80fb4a288..c1828e8a9 100644
--- a/asm/eval.c
+++ b/asm/eval.c
@@ -71,7 +71,6 @@ static int *opflags;
 static struct eval_hints *hint;
 static int64_t deadman;
 
-
 /*
  * Unimportant cleanup is done to avoid confusing people who are trying
  * to debug real memory leaks
diff --git a/asm/eval.h b/asm/eval.h
index ba471a22a..03476f758 100644
--- a/asm/eval.h
+++ b/asm/eval.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * eval.h   header file for eval.c
  */
 
diff --git a/asm/floats.h b/asm/floats.h
index c46351369..54ee1fe79 100644
--- a/asm/floats.h
+++ b/asm/floats.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2020 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * floats.h   header file for the floating-point constant module of
  *	      the Netwide Assembler
  */
diff --git a/asm/labels.c b/asm/labels.c
index f6b940fca..a0436c3b0 100644
--- a/asm/labels.c
+++ b/asm/labels.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-
 #include "nasm.h"
 #include "nasmlib.h"
 #include "error.h"
diff --git a/asm/listing.c b/asm/listing.c
index 186b8b4e1..32cddd371 100644
--- a/asm/listing.c
+++ b/asm/listing.c
@@ -214,7 +214,6 @@ static void list_output(const struct out_data *data)
     uint64_t offset = data->offset;
     const uint8_t *p = data->data;
 
-
     if (!listfp || suppress || user_nolist)
         return;
 
diff --git a/asm/nasm.c b/asm/nasm.c
index 76c70f6d4..539dff49e 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-
 #include "nasm.h"
 #include "nasmlib.h"
 #include "nctype.h"
@@ -2339,7 +2338,6 @@ static void help(FILE *out)
         "   --limit-X val  set execution limit X\n"
         , out);
 
-
     for (i = 0; i <= LIMIT_MAX; i++) {
         fprintf(out, "       %-20s %s [",
                 limit_info[i].name, limit_info[i].help);
diff --git a/asm/parser.c b/asm/parser.c
index 6b19ffac8..d35eeface 100644
--- a/asm/parser.c
+++ b/asm/parser.c
@@ -50,7 +50,6 @@
 #include "assemble.h"
 #include "tables.h"
 
-
 static int end_expression_next(void);
 
 static struct tokenval tokval;
diff --git a/asm/parser.h b/asm/parser.h
index 15298cb02..1f5695756 100644
--- a/asm/parser.h
+++ b/asm/parser.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * parser.h   header file for the parser module of the Netwide
  *            Assembler
  */
diff --git a/asm/pptok.dat b/asm/pptok.dat
index 211449739..dc878a6b5 100644
--- a/asm/pptok.dat
+++ b/asm/pptok.dat
@@ -1,5 +1,5 @@
 ## --------------------------------------------------------------------------
-##   
+##
 ##   Copyright 1996-2019 The NASM Authors - All Rights Reserved
 ##   See the file AUTHORS included with the NASM distribution for
 ##   the specific copyright holders.
@@ -14,7 +14,7 @@
 ##     copyright notice, this list of conditions and the following
 ##     disclaimer in the documentation and/or other materials provided
 ##     with the distribution.
-##     
+##
 ##     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 ##     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 ##     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/asm/preproc.c b/asm/preproc.c
index ac42131e9..29cbe239a 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -310,7 +310,6 @@ struct MMacro {
     } dbg;
 };
 
-
 /* Store the definition of a multi-line macro, as defined in a
  * previous recursive macro expansion.
  */
@@ -339,7 +338,6 @@ struct Context {
     unsigned int depth;
 };
 
-
 static inline const char *tok_text(const struct Token *t)
 {
     return (t->len <= INLINE_TEXT) ? t->text.a : t->text.p.ptr;
@@ -3393,7 +3391,6 @@ static bool parse_mmacro_spec(Token *tline, MMacro *def, const char *directive)
     return true;
 }
 
-
 /*
  * Decode a size directive
  */
@@ -3628,7 +3625,6 @@ static void define_stack_smacro(const char *name, int offset)
     define_smacro(name, true, tt, NULL);
 }
 
-
 /*
  * This implements the %assign directive: expand an smacro expression,
  * then evaluate it, and assign the corresponding number to an smacro.
@@ -5093,7 +5089,6 @@ struct concat_mask {
     enum concat_flags mask_tail;
 };
 
-
 static inline bool pp_concat_match(const Token *t, enum concat_flags mask)
 {
     enum concat_flags ctype = 0;
@@ -5201,7 +5196,7 @@ static bool paste_tokens(Token **head, const struct concat_mask *m,
              * In a sequence of %+ ... %+ ... %+ pasting sequences where
              * some expansions in the middle have ended up empty,
              * we can end up having multiple %+ tokens in a row;
-             * just drop whem in that case.
+             * just drop when in that case.
              */
             next = *nextp;
             while (next) {
@@ -6506,7 +6501,6 @@ static MMacro *is_mmacro(Token * tline, int *nparamp, Token ***paramsp)
     return NULL;
 }
 
-
 #if 0
 
 /*
@@ -6529,7 +6523,6 @@ static void push_mmacro(MMacro *m)
     m->prev = i;
 }
 
-
 /*
  * Restore MMacro invocation specific fields that were
  * saved during a previous recursive macro expansion
diff --git a/asm/preproc.h b/asm/preproc.h
index 711304663..550f89022 100644
--- a/asm/preproc.h
+++ b/asm/preproc.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2020 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * preproc.h  header file for preproc.c
  */
 
diff --git a/asm/quote.h b/asm/quote.h
index d8226cdb2..17d062706 100644
--- a/asm/quote.h
+++ b/asm/quote.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/asm/rdstrnum.c b/asm/rdstrnum.c
index 319f140a8..5e8188e8f 100644
--- a/asm/rdstrnum.c
+++ b/asm/rdstrnum.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2016 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/asm/segalloc.c b/asm/segalloc.c
index 6d7a4202f..87578fe88 100644
--- a/asm/segalloc.c
+++ b/asm/segalloc.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2018 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/asm/srcfile.c b/asm/srcfile.c
index b44c021c2..0d3dcd3d0 100644
--- a/asm/srcfile.c
+++ b/asm/srcfile.c
@@ -44,7 +44,6 @@
 
 #include "compiler.h"
 
-
 #include "nasmlib.h"
 #include "hashtbl.h"
 #include "srcfile.h"
diff --git a/asm/stdscan.h b/asm/stdscan.h
index 8dbc2d037..3c25babb2 100644
--- a/asm/stdscan.h
+++ b/asm/stdscan.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * stdscan.h	header file for stdscan.c
  */
 
diff --git a/asm/strfunc.c b/asm/strfunc.c
index 236b9d2ff..48cf32b3c 100644
--- a/asm/strfunc.c
+++ b/asm/strfunc.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/common/common.c b/common/common.c
index aa7780559..68fb15bd1 100644
--- a/common/common.c
+++ b/common/common.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2021 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/disasm/disasm.c b/disasm/disasm.c
index ac2dc97f3..97c022cef 100644
--- a/disasm/disasm.c
+++ b/disasm/disasm.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-
 #include "nasm.h"
 #include "disasm.h"
 #include "sync.h"
@@ -271,7 +270,6 @@ static uint32_t append_evex_mem_deco(char *buf, uint32_t num, opflags_t type,
         }
     }
 
-
     return num_chars;
 }
 
@@ -412,7 +410,6 @@ static uint8_t *do_ea(uint8_t *data, int modrm, int asize,
             mod = 2;            /* fake disp32 */
         }
 
-
         if (rm == 4) {          /* process SIB */
             uint8_t vsib_hi = 0;
             scale = (sib >> 6) & 03;
@@ -1576,7 +1573,6 @@ int32_t disasm(uint8_t *data, int32_t data_size, char *output, int outbufsize, i
                 started = true;
             }
 
-
             if (o->segment & SEG_DISP8) {
                 if (is_evex) {
                     const char *prefix;
diff --git a/disasm/disasm.h b/disasm/disasm.h
index 053474d2f..7a5723153 100644
--- a/disasm/disasm.h
+++ b/disasm/disasm.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/disasm/sync.c b/disasm/sync.c
index b9b866ea8..64226cf35 100644
--- a/disasm/sync.c
+++ b/disasm/sync.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-
 #include "nasmlib.h"
 #include "sync.h"
 
diff --git a/disasm/sync.h b/disasm/sync.h
index 15c5afdf3..c2af0ceba 100644
--- a/disasm/sync.h
+++ b/disasm/sync.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * sync.h   header file for sync.c
  */
 
diff --git a/doc/inslist.pl b/doc/inslist.pl
index c7d7da407..6e016281a 100644
--- a/doc/inslist.pl
+++ b/doc/inslist.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ## --------------------------------------------------------------------------
-##   
+##
 ##   Copyright 1996-2017 The NASM Authors - All Rights Reserved
 ##   See the file AUTHORS included with the NASM distribution for
 ##   the specific copyright holders.
@@ -15,7 +15,7 @@
 ##     copyright notice, this list of conditions and the following
 ##     disclaimer in the documentation and/or other materials provided
 ##     with the distribution.
-##     
+##
 ##     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 ##     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 ##     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/include/iflag.h b/include/iflag.h
index 31a0a98c5..5c4a27581 100644
--- a/include/iflag.h
+++ b/include/iflag.h
@@ -4,7 +4,6 @@
 #include "compiler.h"
 #include "ilog2.h"
 
-
 #include "iflaggen.h"
 
 #define IF_GENBIT(bit)          (UINT32_C(1) << ((bit) & 31))
diff --git a/include/ilog2.h b/include/ilog2.h
index bba45955b..4e92e9df5 100644
--- a/include/ilog2.h
+++ b/include/ilog2.h
@@ -60,7 +60,6 @@ extern int const_func alignlog2_64(uint64_t v);
         }                                               \
     } while (0)
 
-
 #if defined(HAVE___BUILTIN_CLZ) && INT_MAX == 2147483647
 
 extern_inline unsigned int const_func ilog2_32(uint32_t v)
diff --git a/include/labels.h b/include/labels.h
index a825d1fff..28c510b74 100644
--- a/include/labels.h
+++ b/include/labels.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2018 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * labels.h  header file for labels.c
  */
 
diff --git a/include/raa.h b/include/raa.h
index e08d90bcb..90c640914 100644
--- a/include/raa.h
+++ b/include/raa.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/include/rdoff.h b/include/rdoff.h
index 973be8c06..868419da9 100644
--- a/include/rdoff.h
+++ b/include/rdoff.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2017 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/include/saa.h b/include/saa.h
index 9d939ef5b..0b163ca4f 100644
--- a/include/saa.h
+++ b/include/saa.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2017 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/include/strlist.h b/include/strlist.h
index faf70e27a..e66e269d8 100644
--- a/include/strlist.h
+++ b/include/strlist.h
@@ -89,5 +89,5 @@ void * safe_alloc strlist_linearize(const struct strlist *list, char sep);
 void strlist_write(const struct strlist *list, const char *sep, FILE *f);
 void strlist_free(struct strlist **listp);
 #define strlist_for_each(p,h) list_for_each((p), strlist_head(h))
- 
+
 #endif /* NASM_STRLIST_H */
diff --git a/include/tables.h b/include/tables.h
index 2b36357e2..c1c6f62eb 100644
--- a/include/tables.h
+++ b/include/tables.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2016 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/misc/fmtinsns.pl b/misc/fmtinsns.pl
index 848ee2de0..c9bb32f3e 100755
--- a/misc/fmtinsns.pl
+++ b/misc/fmtinsns.pl
@@ -20,7 +20,7 @@
 		if ($i > 0 && $c >= $cols[$i]) {
 		    $line .= ' ';
 		    $c++;
-		}	
+		}
 		while ($c < $cols[$i]) {
 		    $line .= "\t";
 		    $c = ($c+8)	& ~7;
diff --git a/nasmlib/bsi.c b/nasmlib/bsi.c
index ae31f4825..9909afa14 100644
--- a/nasmlib/bsi.c
+++ b/nasmlib/bsi.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2016 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-
 #include "nasmlib.h"
 
 /*
diff --git a/nasmlib/md5c.c b/nasmlib/md5c.c
index 79cf4e09a..efd18fdda 100644
--- a/nasmlib/md5c.c
+++ b/nasmlib/md5c.c
@@ -101,7 +101,7 @@ void MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len)
 }
 
 /*
- * Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * Final wrapup - pad to 64-byte boundary with the bit pattern
  * 1 0* (64-bit count of bits processed, MSB-first)
  */
 void MD5Final(unsigned char digest[16], MD5_CTX *ctx)
diff --git a/nasmlib/raa.c b/nasmlib/raa.c
index 038f97acb..786270dd9 100644
--- a/nasmlib/raa.c
+++ b/nasmlib/raa.c
@@ -146,7 +146,6 @@ void *raa_read_ptr(struct RAA *r, raaindex pos)
     return ip ? ip->p : NULL;
 }
 
-
 static struct RAA *
 real_raa_write(struct RAA *r, raaindex posn, union intorptr value)
 {
diff --git a/nasmlib/string.c b/nasmlib/string.c
index 4ee3ecbbe..2ec70518f 100644
--- a/nasmlib/string.c
+++ b/nasmlib/string.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2016 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/nasmlib/ver.c b/nasmlib/ver.c
index 96260b6ca..0af2d6f39 100644
--- a/nasmlib/ver.c
+++ b/nasmlib/ver.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2020 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/nasmlib/zerobuf.c b/nasmlib/zerobuf.c
index 651c0fd42..22cafd41e 100644
--- a/nasmlib/zerobuf.c
+++ b/nasmlib/zerobuf.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2016 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/output/codeview.c b/output/codeview.c
index d1011fcb3..e86191249 100644
--- a/output/codeview.c
+++ b/output/codeview.c
@@ -38,7 +38,6 @@
 #include "version.h"
 #include "compiler.h"
 
-
 #include "nasm.h"
 #include "nasmlib.h"
 #include "error.h"
@@ -147,7 +146,6 @@ struct cv8_state {
     unsigned num_files;
     uint32_t total_filename_len;
 
-
     unsigned total_lines;
 
     struct SAA *symbols;
diff --git a/output/nulldbg.c b/output/nulldbg.c
index 93ec3a7f0..e29833671 100644
--- a/output/nulldbg.c
+++ b/output/nulldbg.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2014 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/output/nullout.c b/output/nullout.c
index 121fe70bd..e9907cbda 100644
--- a/output/nullout.c
+++ b/output/nullout.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2018 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/output/outaout.c b/output/outaout.c
index c59c78965..2696e6a5d 100644
--- a/output/outaout.c
+++ b/output/outaout.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2013 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * outaout.c	output routines for the Netwide Assembler to produce
  *		Linux a.out object files
  */
diff --git a/output/outas86.c b/output/outas86.c
index 54b22f878..9770c6204 100644
--- a/output/outas86.c
+++ b/output/outas86.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2017 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * outas86.c	output routines for the Netwide Assembler to produce
  *		Linux as86 (bin86-0.3) object files
  */
@@ -197,7 +197,6 @@ static void as86_deflabel(char *name, int32_t segment, int64_t offset,
         nasm_nonfatal("as86 format does not support any"
                       " special symbol types");
 
-
     if (name[0] == '.' && name[1] == '.' && name[2] != '@') {
 	if (strcmp(name, "..start")) {
 	    nasm_nonfatal("unrecognised special symbol `%s'", name);
diff --git a/output/outbin.c b/output/outbin.c
index 1522e5cbd..52496dbe9 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -1596,7 +1596,6 @@ static void do_output_srec(void)
     write_srecord(0, alen, 0, etype, NULL);
 }
 
-
 const struct ofmt of_bin = {
     "Flat raw binary (MS-DOS, embedded, ...)",
     "bin",
diff --git a/output/outcoff.c b/output/outcoff.c
index c2b4eb6e3..5e872ef9c 100644
--- a/output/outcoff.c
+++ b/output/outcoff.c
@@ -1369,7 +1369,6 @@ const struct ofmt of_coff = {
 
 #endif
 
-
 #ifdef OF_WIN32
 
 static const struct pragma_facility coff_win_pragma_list[] = {
diff --git a/output/outdbg.c b/output/outdbg.c
index e7a9a4e5e..c67a15263 100644
--- a/output/outdbg.c
+++ b/output/outdbg.c
@@ -520,7 +520,6 @@ static void dbgdbg_debug_directive(const char *id, const char *value)
             id, value, pass_count(), pass_type_name());
 }
 
-
 static const struct pragma_facility dbgdbg_pragma_list[] = {
     { "dbgdbg", dbg_pragma },
     { NULL, dbg_pragma }        /* Won't trigger, "debug" is a reserved ns */
diff --git a/output/outelf.c b/output/outelf.c
index ad8d2104d..d8023b281 100644
--- a/output/outelf.c
+++ b/output/outelf.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-
 #include "nasm.h"
 #include "nasmlib.h"
 #include "error.h"
@@ -558,7 +557,7 @@ static void elf_init(void)
     saa_wbytes(strs, elf_module, strlen(elf_module)+1);
     strslen = 2 + strlen(elf_module);
     shstrtab = NULL;
-    shstrtablen = shstrtabsize = 0;;
+    shstrtablen = shstrtabsize = 0;
     add_sectname("", "");       /* SHN_UNDEF */
 
     fwds = NULL;
@@ -2422,7 +2421,6 @@ static const struct pragma_facility elf_pragma_list[] =
     { NULL, NULL }          /* Implements the canonical output name */
 };
 
-
 static const struct dfmt elf32_df_dwarf = {
     "ELF32 (i386) dwarf (newer)",
     "dwarf",
@@ -3109,7 +3107,6 @@ static void dwarf_output(int type, void *param)
     debug_immcall = 0;
 }
 
-
 static void dwarf_generate(void)
 {
     uint8_t *pbuf;
diff --git a/output/outform.c b/output/outform.c
index a2fdde84f..daea0055b 100644
--- a/output/outform.c
+++ b/output/outform.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2011 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -40,7 +40,6 @@
 
 #include "compiler.h"
 
-
 #define BUILD_DRIVERS_ARRAY
 #include "outform.h"
 #include "outlib.h"
diff --git a/output/outieee.c b/output/outieee.c
index 7ba903666..4b7229417 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -456,7 +456,7 @@ static void ieee_data_new(struct ieeeSection *segto)
 /*
  * this routine is unalduterated bloatware.  I usually don't do this
  * but I might as well see what it is like on a harmless program.
- * If anyone wants to optimize this is a good canditate!
+ * If anyone wants to optimize this is a good candidate!
  */
 static void ieee_write_fixup(int32_t segment, int32_t wrt,
                              struct ieeeSection *segto, int size,
diff --git a/output/outlib.h b/output/outlib.h
index 7f6a78932..55c7ebb93 100644
--- a/output/outlib.h
+++ b/output/outlib.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2020 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,7 @@
  *     copyright notice, this list of conditions and the following
  *     disclaimer in the documentation and/or other materials provided
  *     with the distribution.
- *     
+ *
  *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/output/pecoff.h b/output/pecoff.h
index b99bed09c..6a4910c4f 100644
--- a/output/pecoff.h
+++ b/output/pecoff.h
@@ -538,5 +538,4 @@ extern char coff_outfile[FILENAME_MAX];
 
 extern int coff_make_section(char *name, uint32_t flags);
 
-
 #endif /* PECOFF_H */
diff --git a/stdlib/snprintf.c b/stdlib/snprintf.c
index e4a1c0b50..1171eff2c 100644
--- a/stdlib/snprintf.c
+++ b/stdlib/snprintf.c
@@ -6,7 +6,6 @@
 
 #include "compiler.h"
 
-
 #include "nasmlib.h"
 
 #if !defined(HAVE_SNPRINTF) && !defined(HAVE__SNPRINTF)
diff --git a/stdlib/vsnprintf.c b/stdlib/vsnprintf.c
index 58de6515d..a16ac5078 100644
--- a/stdlib/vsnprintf.c
+++ b/stdlib/vsnprintf.c
@@ -7,7 +7,6 @@
 
 #include "compiler.h"
 
-
 #include "nasmlib.h"
 #include "error.h"
 
diff --git a/test/a32offs.asm b/test/a32offs.asm
index 4d17e0e43..4d86ad4ee 100644
--- a/test/a32offs.asm
+++ b/test/a32offs.asm
@@ -3,7 +3,7 @@
 	bits 16
 foo:	a32 loop foo
 bar:	loop bar, ecx
-	
+
 	bits 32
 baz:	a16 loop baz
 qux:	loop qux, cx
diff --git a/test/avx005.asm b/test/avx005.asm
index 08765140d..70d11389d 100644
--- a/test/avx005.asm
+++ b/test/avx005.asm
@@ -526,4 +526,4 @@ x VFNMSUB321SD   regxmm,regxmm,regxmm     ; VEX_FMA,RELAX
 
 ; EOF
 
- 	  	 
+
diff --git a/test/br3041451.asm b/test/br3041451.asm
index c8b0f3a7b..a68decdfe 100644
--- a/test/br3041451.asm
+++ b/test/br3041451.asm
@@ -33,7 +33,7 @@
 		%if i == 2
 			%exitrep
 		%endif
-	%endrep 
+	%endrep
 
 	;
 	; MISS: It's negative
diff --git a/test/br3109604.asm b/test/br3109604.asm
index 9032e8d5b..60e5a15ad 100644
--- a/test/br3109604.asm
+++ b/test/br3109604.asm
@@ -3,7 +3,7 @@
 
 	bits 64
 b0:	vmovd xmm2, [rdx+r9]
-e0:	
-	
+e0:
+
 	section .data
 len:	dd e0 - b0		; Should be 6
diff --git a/test/br3392392.asm b/test/br3392392.asm
index 0143aa47c..d1e3a5120 100644
--- a/test/br3392392.asm
+++ b/test/br3392392.asm
@@ -13,4 +13,4 @@
 	vpaddd zmm0, zmm0, [rax]{k1}
 	vpaddd zmm0, zmm1, zmm2{1to16}
 %endif
-	
+
diff --git a/test/br3392538.asm b/test/br3392538.asm
index 54e8f08d6..b43d17d14 100644
--- a/test/br3392538.asm
+++ b/test/br3392538.asm
@@ -8,7 +8,7 @@ _start:
 	mov	rax, 1	; write syscall
 	mov	rdi, 1
 	mov	rsi, msg
-	mov	rdx, msglen 
+	mov	rdx, msglen
 	syscall
 
 	mov	rax, 60	; exit syscall
diff --git a/test/elf64so.asm b/test/elf64so.asm
index f1b234642..130ed3ca2 100644
--- a/test/elf64so.asm
+++ b/test/elf64so.asm
@@ -53,7 +53,7 @@ lrotate:			; [1]
 	  ret
 
 ;; prototype: void greet_*(void);
-;; 
+;;
 ;;  Arguments are:	rdi - rsi - rdx - rcx - r8 - r9
 ;;  Registers:		rbx, rbp, r12-r15 are saved
 ;; greet_s() is Small PIC model, greet_m() is Medium PIC model
@@ -88,7 +88,7 @@ greet_m:
 	  mov rax,[rax+r15]	 ; localptr
 	  mov rdx,[rax]		 ; *localptr = localint
 	  mov rdi,printfstr wrt ..gotoff ; &printfstr - r15
-	  add rdi,r15		; &printfstr 
+	  add rdi,r15		; &printfstr
 	  xor eax,eax		; No fp arguments
 	  pop r15
 	  jmp printf wrt ..plt	; [10]
@@ -110,7 +110,7 @@ selfptr	  dq selfptr wrt ..sym	; [16]
 	  SECTION .bss
 ; a useless symbol
 useless	  resq 1
-	
+
 ; an integer
 integer	  resq 1		; [3]
 
diff --git a/test/floatexp.asm b/test/floatexp.asm
index 2bc359eb3..b0ca445c5 100644
--- a/test/floatexp.asm
+++ b/test/floatexp.asm
@@ -213,7 +213,7 @@
 ;
 ; Test hexadecimal floating-point numbers
 ;
- 
+
 ; 16-bit
 	mov ax,__float16__(1.0)
 	mov ax,__float16__(0x1.0)
@@ -284,7 +284,7 @@
 	mov rax,__float64__(0x0000123456789.0)
 	mov rax,__float64__(0x123456789.0p+0)
 	mov rax,__float64__(0x123456789.0p+300)
-	
+
 ; 80-bit
 	mov rax,__float80m__(1.0)
 	mov ax,__float80e__(1.0)
diff --git a/test/fwdoptpp.asm b/test/fwdoptpp.asm
index e1f5dd63d..1d776e3fd 100644
--- a/test/fwdoptpp.asm
+++ b/test/fwdoptpp.asm
@@ -9,7 +9,7 @@
     %endif
   %endif
 %endif
-	
+
 n0:	jmp n1
 n1:	jmp n2
 n2:	jmp n3
@@ -138,7 +138,7 @@ n124:	jmp n125
 n125:	jmp n126
 n126:	jmp n127
 n127:	jmp n0
-	
+
 %if ($-$$) > 257
   %ifdef FATAL
     %fatal "Out of space!"
diff --git a/test/iftoken.asm b/test/iftoken.asm
index 7a0fec495..35e54b1d7 100644
--- a/test/iftoken.asm
+++ b/test/iftoken.asm
@@ -4,12 +4,12 @@
 %define NMACRO 1
 %define TMACRO 1 2
 	db 'N "":'
-%iftoken 
+%iftoken
 	db ' token'
 %else
 	db ' ntoken'
 %endif
-%ifempty 
+%ifempty
 	db ' empty'
 %else
 	db ' nempty'
diff --git a/test/imm64.asm b/test/imm64.asm
index a1140443f..e198f8a6e 100644
--- a/test/imm64.asm
+++ b/test/imm64.asm
@@ -30,7 +30,7 @@
 	mov [rax],dword 0_11223344_8899aabbh	; 32-bit operation
 	mov qword [rax],0_11223344_8899aabbh
 	mov qword [rax],dword 0_11223344_8899aabbh
-	
+
 	mov rax,strict 11223344h
 	mov rax,strict dword 11223344h
 	mov eax,strict 11223344h
@@ -58,4 +58,4 @@
 	mov [rax],strict dword 0_11223344_8899aabbh	; 32-bit operation
 	mov qword [rax],strict 0_11223344_8899aabbh
 	mov qword [rax],strict dword 0_11223344_8899aabbh
-	
+
diff --git a/test/imul.asm b/test/imul.asm
index d30d25f1a..10a418d6d 100644
--- a/test/imul.asm
+++ b/test/imul.asm
@@ -23,7 +23,7 @@
 	imul rdx
 	imul qword MEM
 %endif
-	
+
 	imul ax,cx
 	imul ax,MEM
 	imul ax,word MEM
diff --git a/test/lnxhello.asm b/test/lnxhello.asm
index 1aa5a5f8b..4bc4d66ac 100644
--- a/test/lnxhello.asm
+++ b/test/lnxhello.asm
@@ -18,13 +18,13 @@
 _start:
 	; gdb doesn't like to stop at the entry point address, so
 	; we put a nop here for pure convenience
-	nop				
+	nop
 
 
 write_hello:
 	mov edx, hello_len
 	mov ecx, hello
-	
+
 .loop:
 	mov eax, SYS_write
 	mov ebx, 1			; stdout
@@ -37,7 +37,7 @@ write_hello:
 	sub edx, eax
 	jnz .loop
 
-ok:	
+ok:
 	mov eax, SYS_exit
 	xor ebx, ebx
 	int 80h
@@ -48,7 +48,7 @@ error:
 	mov ebx, 1		; Error
 	int 80h
 	hlt
-	
+
 	section .rodata
 hello:	db "Hello, World!", 10
 hello_len equ $-hello
diff --git a/test/loopoffs.asm b/test/loopoffs.asm
index 54ef4ac61..e436c0191 100644
--- a/test/loopoffs.asm
+++ b/test/loopoffs.asm
@@ -9,4 +9,5 @@ delay3:	loop delay3,ecx
 	loop $,ecx
 delay4:	a32 loop delay4,ecx
 	a32 loop $,ecx
-	
\ No newline at end of file
+
+\ Pas de fin de ligne à la fin du fichier
diff --git a/test/lwp.asm b/test/lwp.asm
index f097b63bf..e6a53eeb0 100644
--- a/test/lwp.asm
+++ b/test/lwp.asm
@@ -210,4 +210,4 @@ testcase { 0x67, 0x8f, 0xea, 0x00, 0x12, 0x88, 0xfe, 0xca, 0x00, 0x00, 0x78, 0x5
 
 ; EOF
 
- 	  	 
+
diff --git a/test/macroerr.asm b/test/macroerr.asm
index d1be751c4..641163ad2 100644
--- a/test/macroerr.asm
+++ b/test/macroerr.asm
@@ -8,5 +8,5 @@
 	bluttan ptr
 	blej ptr
 	dd ptr, ptr
-	
+
 ptr:
diff --git a/test/mmxsize.asm b/test/mmxsize.asm
index 0a478391f..3e9d8c625 100644
--- a/test/mmxsize.asm
+++ b/test/mmxsize.asm
@@ -33,6 +33,6 @@
 	movmskps rax,xmm1
 	movmskpd rax,xmm1
 	nop
-	
+
 	section .bss
 foo	resq 1
diff --git a/test/movd64.asm b/test/movd64.asm
index b328c3496..96bc20666 100644
--- a/test/movd64.asm
+++ b/test/movd64.asm
@@ -10,6 +10,6 @@
 ;	movq dword [rax], mm1
 	movd qword [rax], mm1
 	movq qword [rax], mm1
-	
+
 ;	movd mm2, mm1
 	movq mm2, mm1
diff --git a/test/nop.asm b/test/nop.asm
index 71b7f7b26..d6c36efe3 100644
--- a/test/nop.asm
+++ b/test/nop.asm
@@ -11,7 +11,7 @@
 	xchg ax,ax
 	xchg eax,eax
 	xchg rax,rax
-	
+
 	rep xchg ax,ax
 	rep xchg eax,eax
 	rep xchg rax,rax
diff --git a/test/objexe.asm b/test/objexe.asm
index 9959f40fa..971336ea3 100644
--- a/test/objexe.asm
+++ b/test/objexe.asm
@@ -6,7 +6,7 @@
 ; To test:
 ;    objexe
 ; (should print `hello, world')
-	  
+
 	  segment code
 
 ..start:  mov ax,data
diff --git a/test/optimization.asm b/test/optimization.asm
index d78209d96..56f130ee9 100644
--- a/test/optimization.asm
+++ b/test/optimization.asm
@@ -73,7 +73,7 @@ galog2:
 ; Sbyte tests...
 onetwentysix	equ 126
 onetwentynine	equ 129
-	
+
 add eax,onetwentyseven		; sbyte (forward)
 add eax,onetwentyeight		; not sbyte (forward)
 add eax,onetwentyseven		; sbyte (forward)
@@ -84,7 +84,7 @@ add ecx,onetwentyeight		; not sbyte (forward)
 add ecx,onetwentyseven		; sbyte (forward)
 add ecx,onetwentysix		; sbyte (backward)
 add ecx,onetwentynine		; not sbyte (backward)
-	
+
 onetwentyseven	equ 127
 onetwentyeight	equ 128
 
@@ -99,6 +99,6 @@ ialog1:
 add eax, ialog2-ialog1
 times 127 - 3 nop
 ialog2:
-	
+
 ; Do not confuse forward references and segmentless addresses!
 jmp 12345
diff --git a/test/org.asm b/test/org.asm
index 792c39a5d..32dd17d29 100644
--- a/test/org.asm
+++ b/test/org.asm
@@ -3,7 +3,7 @@
 
 ;
 ; Simple test of a 64-bit org directive
-; 
+;
 		bits 64
 		org 0xffffffffffff0000
 
diff --git a/test/popcnt.asm b/test/popcnt.asm
index 000961980..ea2a8fbad 100644
--- a/test/popcnt.asm
+++ b/test/popcnt.asm
@@ -29,4 +29,5 @@
 	popcnt rax,rcx
 	popcnt rax,[rsi]
 	popcnt rax,qword [rsi]
-	
\ No newline at end of file
+
+\ Pas de fin de ligne à la fin du fichier
diff --git a/test/ppindirect.asm b/test/ppindirect.asm
index 2785378af..27daa646d 100644
--- a/test/ppindirect.asm
+++ b/test/ppindirect.asm
@@ -3,7 +3,7 @@
 ; Fun tests of the preprocessor indirection mode...
 
 	bits 64
-	
+
 %assign foo1		11
 %assign foo11		1111
 %assign foo2		22
@@ -25,7 +25,7 @@
 
 %define foo33bar	999999
 	dd	%[foo%[foo3]bar]
-	
+
 %assign bctr 0
 %macro bluttan 0
 %assign bctr bctr+1
diff --git a/test/radix.asm b/test/radix.asm
index 1c5645729..e07f1839e 100644
--- a/test/radix.asm
+++ b/test/radix.asm
@@ -36,7 +36,7 @@
 	db 0hb			; Hex
 	db 0xd			; Hex
 	db 0xb			; Hex
-	
+
 	;; Floating-point constants
 	;; All of these should output B4A21147
 	dd 3.7282705e+4		; Decimal
@@ -46,7 +46,7 @@
 
 	dd 0x1.23456789p+15	; Hex
 	dd 0h1.23456789p+15	; Hex
-	
+
 	dd 0o1.10642547422p+15	; Octal
 	dd 0q1.10642547422p+15	; Octal
 
diff --git a/test/reldef.asm b/test/reldef.asm
index 1741e13d3..f1e2717b4 100644
--- a/test/reldef.asm
+++ b/test/reldef.asm
@@ -25,12 +25,12 @@ start:
 	lea rcx, [rod2]
 	lea rdx, [bar]
 	lea rbx, [foo]
-	
+
 	lea rax, [rdi+rod1-$$]
 	lea rcx, [rdi+rod2-$$]
 	lea rdx, [rdi+bar-$$]
 	lea rbx, [rdi+foo-$$]
-	
+
 	mov rax, [rdi+rod1-$$]
 	mov rcx, [rdi+rod2-$$]
 	mov rdx, [rdi+bar-$$]
@@ -40,7 +40,7 @@ start:
 	mov rcx, dword rod2-$$
 	mov rdx, dword bar-$$
 	mov rbx, dword foo-$$
-	
+
 	section .data
 	dq rod1
 	dq rod2
diff --git a/test/utf.asm b/test/utf.asm
index 00207dc6b..27e35d367 100644
--- a/test/utf.asm
+++ b/test/utf.asm
@@ -42,7 +42,7 @@
 	mov eax,ul(`ab`)
 	mov ebx,ul(`\U0001abcd`)
 	mov ecx,wl(`\U0001abcd`)
-	
+
 	db `Test \u306a\U0001abcd\n`
 	dw ub(`Test \u306a\U0001abcd\n`)
 	dd wb(`Test \u306a\U0001abcd\n`)
diff --git a/test/winalign.asm b/test/winalign.asm
index 62abf827b..cad0a376d 100644
--- a/test/winalign.asm
+++ b/test/winalign.asm
@@ -22,7 +22,7 @@
 	dd 90
 	dd 91
 	dd 92
-	
+
 	section .xdata
 	dd 7
 	dd 8
diff --git a/test/xchg.asm b/test/xchg.asm
index 9c826dd94..4c5b63918 100644
--- a/test/xchg.asm
+++ b/test/xchg.asm
@@ -7,7 +7,7 @@
 %endmacro
 
 	bits 16
-	
+
 	x ax,ax
 	x ax,cx
 	x ax,dx
@@ -26,7 +26,7 @@
 	x eax,edi
 
 	bits 32
-	
+
 	x ax,ax
 	x ax,cx
 	x ax,dx
@@ -45,7 +45,7 @@
 	x eax,edi
 
 	bits 64
-	
+
 	x ax,ax
 	x ax,cx
 	x ax,dx
diff --git a/tools/syncfiles.pl b/tools/syncfiles.pl
index eb26484ed..4290a0253 100755
--- a/tools/syncfiles.pl
+++ b/tools/syncfiles.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ## --------------------------------------------------------------------------
-##   
+##
 ##   Copyright 1996-2009 The NASM Authors - All Rights Reserved
 ##   See the file AUTHORS included with the NASM distribution for
 ##   the specific copyright holders.
@@ -15,7 +15,7 @@
 ##     copyright notice, this list of conditions and the following
 ##     disclaimer in the documentation and/or other materials provided
 ##     with the distribution.
-##     
+##
 ##     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 ##     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 ##     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/travis/test/avx005.asm b/travis/test/avx005.asm
index d79d46f48..df002066d 100644
--- a/travis/test/avx005.asm
+++ b/travis/test/avx005.asm
@@ -524,4 +524,4 @@ x VFNMSUB321SD   regxmm,regxmm,regxmm     ; VEX_FMA,RELAX
 
 ; EOF
 
- 	  	 
+
diff --git a/travis/test/tmap.asm b/travis/test/tmap.asm
index a634e1b0b..17c8a9aeb 100644
--- a/travis/test/tmap.asm
+++ b/travis/test/tmap.asm
@@ -84,7 +84,7 @@
 [global %1]
 %endmacro
 
-%define CODE_SEG .text                         
+%define CODE_SEG .text
 %endif
 
 
@@ -886,9 +886,9 @@ R_DrawSpan_8:
         push    edi
         push    ebx
 ;;
-;; initilise registers
+;; initialise registers
 ;;
-  
+
         mov     edx, [ds_xfrac]
         mov     eax, [ds_ystep]
         ror     edx, 14
@@ -925,7 +925,7 @@ R_DrawSpan_8:
 
 ;   summary
 ; edx = high16bit xfrac[0..13], ah=ystep[16..24] al=xtep[14..21]
-; ebx = high16bit =0, bh=yfrac[16..24], bl=xfrac[14..21] 
+; ebx = high16bit =0, bh=yfrac[16..24], bl=xfrac[14..21]
 ; ecx = colormap table cl=0 (colormap is aligned 8 bits)
 ; eax = high16bit yfrac[0..15], dx = count
 ; esi = flat texture source
@@ -940,9 +940,9 @@ align 4
          mov      cl, [esi+ebp]
         adc      bh, dh
          mov      cl, [ecx]
-        and      bh, 0x3f 
+        and      bh, 0x3f
          mov   [edi], cl
-        mov     ebp, ebx        
+        mov     ebp, ebx
          inc     edi
          shr     ebp, 2
 
@@ -951,7 +951,7 @@ align 4
          mov      cl, [esi+ebp]
         adc      bl, dl
          mov      cl, [ecx]
-        mov     ebp, ebx 
+        mov     ebp, ebx
          mov   [edi], cl
         inc     edi
          shr     ebp, 2
diff --git a/version.pl b/version.pl
index 634ad311c..f44598d7c 100755
--- a/version.pl
+++ b/version.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ## --------------------------------------------------------------------------
-##   
+##
 ##   Copyright 1996-2016 The NASM Authors - All Rights Reserved
 ##   See the file AUTHORS included with the NASM distribution for
 ##   the specific copyright holders.
@@ -15,7 +15,7 @@
 ##     copyright notice, this list of conditions and the following
 ##     disclaimer in the documentation and/or other materials provided
 ##     with the distribution.
-##     
+##
 ##     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 ##     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 ##     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/x86/regs.dat b/x86/regs.dat
index cec8420f8..0b3259abd 100644
--- a/x86/regs.dat
+++ b/x86/regs.dat
@@ -1,5 +1,5 @@
 ## --------------------------------------------------------------------------
-##   
+##
 ##   Copyright 1996-2009 The NASM Authors - All Rights Reserved
 ##   See the file AUTHORS included with the NASM distribution for
 ##   the specific copyright holders.
@@ -14,7 +14,7 @@
 ##     copyright notice, this list of conditions and the following
 ##     disclaimer in the documentation and/or other materials provided
 ##     with the distribution.
-##     
+##
 ##     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 ##     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 ##     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/x86/regs.pl b/x86/regs.pl
index 31a3fb323..84049b3d1 100755
--- a/x86/regs.pl
+++ b/x86/regs.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ## --------------------------------------------------------------------------
-##   
+##
 ##   Copyright 1996-2009 The NASM Authors - All Rights Reserved
 ##   See the file AUTHORS included with the NASM distribution for
 ##   the specific copyright holders.
@@ -15,7 +15,7 @@
 ##     copyright notice, this list of conditions and the following
 ##     disclaimer in the documentation and/or other materials provided
 ##     with the distribution.
-##     
+##
 ##     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 ##     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 ##     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF