diff --git a/src/WebServer.ino b/src/WebServer.ino
index d91f5d749..b8a241c96 100644
--- a/src/WebServer.ino
+++ b/src/WebServer.ino
@@ -460,10 +460,11 @@ size_t streamFile_htmlEscape(const String& fileName)
 
 #define TASKS_PER_PAGE TASKS_MAX
 
+// Uncrustify must not be used on macros, so turn it off.
+// *INDENT-OFF*
 #define strncpy_webserver_arg(D, N) safe_strncpy(D, WebServer.arg(N).c_str(), sizeof(D));
-#define update_whenset_FormItemInt(K, V) { int tmpVal; \
-                                           if (getCheckWebserverArg_int(K, tmpVal)) V = tmpVal; }
-
+// Uncrustify must not be used on macros, but we're now done, so turn Uncrustify on again.
+// *INDENT-ON*
 
 void WebServerInit()
 {
diff --git a/src/_C001.ino b/src/_C001.ino
index c62c9affd..a2464c903 100644
--- a/src/_C001.ino
+++ b/src/_C001.ino
@@ -120,7 +120,10 @@ bool CPlugin_001(CPlugin::Function function, struct EventStruct *event, String&
   return success;
 }
 
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c001_delay_queue(int controller_number, const C001_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c001_delay_queue(int controller_number, const C001_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   WiFiClient client;
diff --git a/src/_C003.ino b/src/_C003.ino
index 8ca4eebe6..90f53aa91 100644
--- a/src/_C003.ino
+++ b/src/_C003.ino
@@ -66,7 +66,10 @@ bool CPlugin_003(CPlugin::Function function, struct EventStruct *event, String&
   return success;
 }
 
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c003_delay_queue(int controller_number, const C003_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c003_delay_queue(int controller_number, const C003_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   bool success = false;
diff --git a/src/_C004.ino b/src/_C004.ino
index 82d7bfc51..e41fc656c 100644
--- a/src/_C004.ino
+++ b/src/_C004.ino
@@ -77,7 +77,10 @@ bool CPlugin_004(CPlugin::Function function, struct EventStruct *event, String&
   return success;
 }
 
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c004_delay_queue(int controller_number, const C004_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c004_delay_queue(int controller_number, const C004_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   WiFiClient client;
diff --git a/src/_C007.ino b/src/_C007.ino
index 0a627677b..fe54a81fd 100644
--- a/src/_C007.ino
+++ b/src/_C007.ino
@@ -69,7 +69,10 @@ bool CPlugin_007(CPlugin::Function function, struct EventStruct *event, String&
   return success;
 }
 
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c007_delay_queue(int controller_number, const C007_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c007_delay_queue(int controller_number, const C007_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   WiFiClient client;
diff --git a/src/_C008.ino b/src/_C008.ino
index 349508fe0..902e19886 100644
--- a/src/_C008.ino
+++ b/src/_C008.ino
@@ -97,7 +97,11 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String&
 //********************************************************************************
 // Generic HTTP get request
 //********************************************************************************
+
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c008_delay_queue(int controller_number, const C008_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c008_delay_queue(int controller_number, const C008_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   while (element.txt[element.valuesSent] == "") {
diff --git a/src/_C009.ino b/src/_C009.ino
index 70e655d6a..3210578a0 100644
--- a/src/_C009.ino
+++ b/src/_C009.ino
@@ -89,7 +89,11 @@ bool CPlugin_009(CPlugin::Function function, struct EventStruct *event, String&
 /*********************************************************************************************\
  * FHEM HTTP request
 \*********************************************************************************************/
+
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c009_delay_queue(int controller_number, const C009_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c009_delay_queue(int controller_number, const C009_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   WiFiClient client;
diff --git a/src/_C010.ino b/src/_C010.ino
index bb4d9ef3d..549971049 100644
--- a/src/_C010.ino
+++ b/src/_C010.ino
@@ -87,7 +87,11 @@ bool CPlugin_010(CPlugin::Function function, struct EventStruct *event, String&
 //********************************************************************************
 // Generic UDP message
 //********************************************************************************
+
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c010_delay_queue(int controller_number, const C010_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c010_delay_queue(int controller_number, const C010_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   while (element.txt[element.valuesSent] == "") {
diff --git a/src/_C011.ino b/src/_C011.ino
index 7d8e28b5f..40a82497a 100644
--- a/src/_C011.ino
+++ b/src/_C011.ino
@@ -134,7 +134,11 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String&
 //********************************************************************************
 // Generic HTTP request
 //********************************************************************************
+
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c011_delay_queue(int controller_number, const C011_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c011_delay_queue(int controller_number, const C011_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   WiFiClient client;
diff --git a/src/_C012.ino b/src/_C012.ino
index 8931774ad..46cfcd02b 100644
--- a/src/_C012.ino
+++ b/src/_C012.ino
@@ -79,7 +79,11 @@ bool CPlugin_012(CPlugin::Function function, struct EventStruct *event, String&
 //********************************************************************************
 // Process Queued Blynk request, with data set to NULL
 //********************************************************************************
+
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c012_delay_queue(int controller_number, const C012_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c012_delay_queue(int controller_number, const C012_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   while (element.txt[element.valuesSent] == "") {
diff --git a/src/_C015.ino b/src/_C015.ino
index f950a0ce5..72055a24e 100644
--- a/src/_C015.ino
+++ b/src/_C015.ino
@@ -200,7 +200,11 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String&
 // Process Queued Blynk request, with data set to NULL
 //********************************************************************************
 // controller_plugin_number = 015 because of C015
+
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c015_delay_queue(int controller_plugin_number, const C015_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c015_delay_queue(int controller_plugin_number, const C015_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   if (!Settings.ControllerEnabled[element.controller_idx])
diff --git a/src/_C016.ino b/src/_C016.ino
index 3fec85efb..76062812b 100644
--- a/src/_C016.ino
+++ b/src/_C016.ino
@@ -121,7 +121,10 @@ bool CPlugin_016(CPlugin::Function function, struct EventStruct *event, String&
 //********************************************************************************
 // Process the data from the cache
 //********************************************************************************
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c016_delay_queue(int controller_number, const C016_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c016_delay_queue(int controller_number, const C016_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   return true;
diff --git a/src/_C017.ino b/src/_C017.ino
index 7645f45ec..8e9cf7190 100644
--- a/src/_C017.ino
+++ b/src/_C017.ino
@@ -75,7 +75,10 @@ bool CPlugin_017(CPlugin::Function function, struct EventStruct *event, String &
   return success;
 }
 
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c017_delay_queue(int controller_number, const C017_queue_element &element, ControllerSettingsStruct &ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c017_delay_queue(int controller_number, const C017_queue_element &element, ControllerSettingsStruct &ControllerSettings)
 {
diff --git a/src/_C018.ino b/src/_C018.ino
index 725937e5b..cf3e1fc37 100644
--- a/src/_C018.ino
+++ b/src/_C018.ino
@@ -661,7 +661,10 @@ bool CPlugin_018(CPlugin::Function function, struct EventStruct *event, String&
   return success;
 }
 
+// Uncrustify may change this into multi line, which will result in failed builds
+// *INDENT-OFF*
 bool do_process_c018_delay_queue(int controller_number, const C018_queue_element& element, ControllerSettingsStruct& ControllerSettings);
+// *INDENT-ON*
 
 bool do_process_c018_delay_queue(int controller_number, const C018_queue_element& element, ControllerSettingsStruct& ControllerSettings) {
   bool   success = C018_data.txHexBytes(element.packed, ControllerSettings.Port);
diff --git a/src/src/ControllerQueue/ControllerDelayHandlerStruct.h b/src/src/ControllerQueue/ControllerDelayHandlerStruct.h
index c3b738375..de24e1344 100644
--- a/src/src/ControllerQueue/ControllerDelayHandlerStruct.h
+++ b/src/src/ControllerQueue/ControllerDelayHandlerStruct.h
@@ -158,6 +158,9 @@ struct ControllerDelayHandlerStruct {
 };
 
 // Uncrustify must not be used on macros, so turn it off.
+// Also make sure to wrap the forward declaration of this function in the same wrappers 
+// as it may not split the forward declaration into multiple lines.
+//
 // *INDENT-OFF*