diff --git a/include/struct.h b/include/struct.h
index 2c38bd4f2..ad0cac04e 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -2788,6 +2788,6 @@ typedef enum JsonRpcError {
 #define BUILDVARSTRING_UNKNOWN_VAR_IS_EMPTY	0x4
 #define BUILDVARSTRING_KEEP_SPACE_FOR_EMPTY_VAR	0x8
 
-#endif /* __struct_include__ */
-
 #include "dynconf.h"
+
+#endif /* __struct_include__ */
diff --git a/include/version.h b/include/version.h
index 7bc437e6a..80f9b31d4 100644
--- a/include/version.h
+++ b/include/version.h
@@ -5,7 +5,7 @@
 ** $Id$
 */
 #ifndef __versioninclude
-#define __versioninclude 1
+#define __versioninclude
 
 /*
  * Utility macros to convert version number constants to strings.
diff --git a/src/modules/antirandom.c b/src/modules/antirandom.c
index 0e1fe9327..6f324c272 100644
--- a/src/modules/antirandom.c
+++ b/src/modules/antirandom.c
@@ -36,6 +36,7 @@ ModuleHeader MOD_HEADER
 #endif
 
 /* "<char1><char2>" followed by "<rest>" */
+/* clang-format off */
 static char *triples_txt[] = {
 	"aj", "fqtvxz",
 	"aq", "deghjkmnprtxyz",
@@ -478,6 +479,7 @@ static char *triples_txt[] = {
 	"zz", "cdfhjnpqrvx",
 	NULL, NULL
 };
+/* clang-format on */
 
 /* Used for parsed triples: */
 #define TRIPLES_REST_SIZE	32
diff --git a/src/modules/utf8functions.c b/src/modules/utf8functions.c
index 761ad146f..6eac97f1b 100644
--- a/src/modules/utf8functions.c
+++ b/src/modules/utf8functions.c
@@ -54,6 +54,7 @@ typedef struct ConfusablesConversionTable {
  * NOTE IF YOU TWEAK ANY OF THE SCORES BELOW:
  * Then also update the sed command from a few lines up :)
  */
+/* clang-format off */
 UnicodeBlocks unicode_blocks[UNICODE_BLOCK_COUNT] =
 {
 	{0x0000, 0x007F, "Basic Latin", 1},
@@ -395,8 +396,10 @@ UnicodeBlocks unicode_blocks[UNICODE_BLOCK_COUNT] =
 	{0xF0000, 0xFFFFF, "Supplementary Private Use Area-A", 1},
 	{0x100000, 0x10FFFF, "Supplementary Private Use Area-B", 1},
 };
+/* clang-format on */
 
 /* Generated by Syzop */
+/* clang-format off */
 ConfusablesConversionTable confusables_table[] =
 {
 	// starting with a0
@@ -5573,6 +5576,7 @@ ConfusablesConversionTable confusables_table[] =
 	{0x1fbf0, 0x4f}, 	// 🯰 -> O
 	{0x1fbf1, 0x6c}, 	// 🯱 -> l
 };
+/* clang-format on */
 
 #define IS_IN_RANGE(c, f, l)    (((c) >= (f)) && ((c) <= (l)))