diff --git a/os/hal/include/hal_buffers.h b/os/hal/include/hal_buffers.h
index 7ce499215..c7f731f83 100644
--- a/os/hal/include/hal_buffers.h
+++ b/os/hal/include/hal_buffers.h
@@ -128,11 +128,11 @@ typedef io_buffers_queue_t output_buffers_queue_t;
 /**
  * @brief   Computes the size of a buffers queue buffer size.
  *
- * @param[in] n         sumber of buffers in the queue
+ * @param[in] n         number of buffers in the queue
  * @param[in] size      size of the buffers
  */
 #define BQ_BUFFER_SIZE(n, size)                                             \
-  (((size_t)(size) + sizeof (size_t)) * (size_t)(n))
+  (((size_t)(size) + (sizeof (size_t)) * (size_t)(n)))
 
 /**
  * @name    Macro Functions
diff --git a/os/hal/include/hal_queues.h b/os/hal/include/hal_queues.h
index a2149f9fe..42d70953a 100644
--- a/os/hal/include/hal_queues.h
+++ b/os/hal/include/hal_queues.h
@@ -192,42 +192,6 @@ typedef io_queue_t input_queue_t;
 #define iqGet(iqp) iqGetTimeout(iqp, TIME_INFINITE)
 /** @} */
 
-/**
- * @brief   Data part of a static input queue initializer.
- * @details This macro should be used when statically initializing an
- *          input queue that is part of a bigger structure.
- *
- * @param[in] name      the name of the input queue variable
- * @param[in] buffer    pointer to the queue buffer area
- * @param[in] size      size of the queue buffer area
- * @param[in] inotify   input notification callback pointer
- * @param[in] link      application defined pointer
- */
-#define _INPUTQUEUE_DATA(name, buffer, size, inotify, link) {               \
-  NULL,                                                                     \
-  0U,                                                                       \
-  (uint8_t *)(buffer),                                                      \
-  (uint8_t *)(buffer) + (size),                                             \
-  (uint8_t *)(buffer),                                                      \
-  (uint8_t *)(buffer),                                                      \
-  (inotify),                                                                \
-  (link)                                                                    \
-}
-
-/**
- * @brief   Static input queue initializer.
- * @details Statically initialized input queues require no explicit
- *          initialization using @p iqInit().
- *
- * @param[in] name      the name of the input queue variable
- * @param[in] buffer    pointer to the queue buffer area
- * @param[in] size      size of the queue buffer area
- * @param[in] inotify   input notification callback pointer
- * @param[in] link      application defined pointer
- */
-#define INPUTQUEUE_DECL(name, buffer, size, inotify, link)                  \
-  input_queue_t name = _INPUTQUEUE_DATA(name, buffer, size, inotify, link)
-
 /**
  * @extends io_queue_t
  *
@@ -308,42 +272,6 @@ typedef io_queue_t output_queue_t;
 #define oqPut(oqp, b) oqPutTimeout(oqp, b, TIME_INFINITE)
  /** @} */
 
-/**
- * @brief   Data part of a static output queue initializer.
- * @details This macro should be used when statically initializing an
- *          output queue that is part of a bigger structure.
- *
- * @param[in] name      the name of the output queue variable
- * @param[in] buffer    pointer to the queue buffer area
- * @param[in] size      size of the queue buffer area
- * @param[in] onotify   output notification callback pointer
- * @param[in] link      application defined pointer
- */
-#define _OUTPUTQUEUE_DATA(name, buffer, size, onotify, link) {              \
-  NULL,                                                                     \
-  (size),                                                                   \
-  (uint8_t *)(buffer),                                                      \
-  (uint8_t *)(buffer) + (size),                                             \
-  (uint8_t *)(buffer),                                                      \
-  (uint8_t *)(buffer),                                                      \
-  (onotify),                                                                \
-  (link)                                                                    \
-}
-
-/**
- * @brief   Static output queue initializer.
- * @details Statically initialized output queues require no explicit
- *          initialization using @p oqInit().
- *
- * @param[in] name      the name of the output queue variable
- * @param[in] buffer    pointer to the queue buffer area
- * @param[in] size      size of the queue buffer area
- * @param[in] onotify   output notification callback pointer
- * @param[in] link      application defined pointer
- */
-#define OUTPUTQUEUE_DECL(name, buffer, size, onotify, link)                 \
-  output_queue_t name = _OUTPUTQUEUE_DATA(name, buffer, size, onotify, link)
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/os/hal/ports/STM32/LLD/CANv1/can_lld.c b/os/hal/ports/STM32/LLD/CANv1/can_lld.c
index 345d209f1..1c2895acf 100644
--- a/os/hal/ports/STM32/LLD/CANv1/can_lld.c
+++ b/os/hal/ports/STM32/LLD/CANv1/can_lld.c
@@ -278,6 +278,8 @@ static void can_lld_sce_handler(CANDriver *canp) {
     flags = (eventflags_t)(esr & 7);
     if ((esr & CAN_ESR_LEC) > 0)
       flags |= CAN_FRAMING_ERROR;
+#else
+    flags = 0;
 #endif
 
     osalSysLockFromISR();
diff --git a/test/rt/testbuild/halconf.h b/test/rt/testbuild/halconf.h
index 70c125e2b..12e9f8e72 100644
--- a/test/rt/testbuild/halconf.h
+++ b/test/rt/testbuild/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/AVR/GPT/halconf.h b/testhal/AVR/GPT/halconf.h
index fcea2ae41..d7c8b6e83 100644
--- a/testhal/AVR/GPT/halconf.h
+++ b/testhal/AVR/GPT/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/AVR/I2C/halconf.h b/testhal/AVR/I2C/halconf.h
index d0e8bdff6..9764317dd 100644
--- a/testhal/AVR/I2C/halconf.h
+++ b/testhal/AVR/I2C/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/AVR/ICU/halconf.h b/testhal/AVR/ICU/halconf.h
index c69e5da98..7a89b7656 100644
--- a/testhal/AVR/ICU/halconf.h
+++ b/testhal/AVR/ICU/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/AVR/PWM/halconf.h b/testhal/AVR/PWM/halconf.h
index 2b7ce3d4e..e00b05736 100644
--- a/testhal/AVR/PWM/halconf.h
+++ b/testhal/AVR/PWM/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/KINETIS/ADC/.cproject b/testhal/KINETIS/ADC/.cproject
index 27c7f1296..4e28c4ae5 100644
--- a/testhal/KINETIS/ADC/.cproject
+++ b/testhal/KINETIS/ADC/.cproject
@@ -21,24 +21,15 @@
 							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1831380856" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1419137561" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1364315252" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.718372197" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
-									<listOptionValue builtIn="false" value="/Users/derek/Documents/Arm/gcc-arm-none-eabi-4_8-2014q2/arm-none-eabi/include"/>
-									<listOptionValue builtIn="false" value="/Users/derek/Documents/Arm/gcc-arm-none-eabi-4_8-2014q2/lib/gcc/arm-none-eabi/4.8.4/include"/>
-								</option>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.718372197" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.479764409" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.754184888" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.852559462" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
-									<listOptionValue builtIn="false" value="/Users/derek/Documents/Arm/gcc-arm-none-eabi-4_8-2014q2/arm-none-eabi/include"/>
-									<listOptionValue builtIn="false" value="/Users/derek/Documents/Arm/gcc-arm-none-eabi-4_8-2014q2/lib/gcc/arm-none-eabi/4.8.4/include"/>
-								</option>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.852559462" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.937950678" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1605316565" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.363143178" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
-									<listOptionValue builtIn="false" value="/Users/derek/Documents/Arm/gcc-arm-none-eabi-4_8-2014q2/arm-none-eabi/include"/>
-									<listOptionValue builtIn="false" value="/Users/derek/Documents/Arm/gcc-arm-none-eabi-4_8-2014q2/lib/gcc/arm-none-eabi/4.8.4/include"/>
-								</option>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.363143178" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1077140712" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 						</toolChain>
@@ -58,4 +49,5 @@
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope"/>
 </cproject>
diff --git a/testhal/KINETIS/ADC/halconf.h b/testhal/KINETIS/ADC/halconf.h
index cf3d9b81e..f8b4e8c77 100644
--- a/testhal/KINETIS/ADC/halconf.h
+++ b/testhal/KINETIS/ADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/KINETIS/I2C/halconf.h b/testhal/KINETIS/I2C/halconf.h
index d5da526da..6430fb283 100644
--- a/testhal/KINETIS/I2C/halconf.h
+++ b/testhal/KINETIS/I2C/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F0xx/ADC/halconf.h b/testhal/STM32/STM32F0xx/ADC/halconf.h
index cf3d9b81e..f8b4e8c77 100644
--- a/testhal/STM32/STM32F0xx/ADC/halconf.h
+++ b/testhal/STM32/STM32F0xx/ADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F0xx/CAN/halconf.h b/testhal/STM32/STM32F0xx/CAN/halconf.h
index 1b1b02851..2f2b659e8 100644
--- a/testhal/STM32/STM32F0xx/CAN/halconf.h
+++ b/testhal/STM32/STM32F0xx/CAN/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F0xx/EXT/halconf.h b/testhal/STM32/STM32F0xx/EXT/halconf.h
index a813cb250..80ff7455a 100644
--- a/testhal/STM32/STM32F0xx/EXT/halconf.h
+++ b/testhal/STM32/STM32F0xx/EXT/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F0xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32F0xx/IRQ_STORM/halconf.h
index d02b92e5b..5bd391078 100644
--- a/testhal/STM32/STM32F0xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F0xx/IRQ_STORM/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F0xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F0xx/PWM-ICU/halconf.h
index f876b9d4a..1fd4d0f0e 100644
--- a/testhal/STM32/STM32F0xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F0xx/PWM-ICU/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F0xx/SPI/halconf.h b/testhal/STM32/STM32F0xx/SPI/halconf.h
index 3d6a61e6b..0312d81d3 100644
--- a/testhal/STM32/STM32F0xx/SPI/halconf.h
+++ b/testhal/STM32/STM32F0xx/SPI/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F0xx/UART/halconf.h b/testhal/STM32/STM32F0xx/UART/halconf.h
index 19ea70d0a..eb719b8e7 100644
--- a/testhal/STM32/STM32F0xx/UART/halconf.h
+++ b/testhal/STM32/STM32F0xx/UART/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F0xx/USB_CDC/halconf.h b/testhal/STM32/STM32F0xx/USB_CDC/halconf.h
index 9349c6dfb..6ebcb2107 100644
--- a/testhal/STM32/STM32F0xx/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32F0xx/USB_CDC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/ADC/halconf.h b/testhal/STM32/STM32F1xx/ADC/halconf.h
index cf3d9b81e..f8b4e8c77 100644
--- a/testhal/STM32/STM32F1xx/ADC/halconf.h
+++ b/testhal/STM32/STM32F1xx/ADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/CAN/halconf.h b/testhal/STM32/STM32F1xx/CAN/halconf.h
index 1b1b02851..2f2b659e8 100644
--- a/testhal/STM32/STM32F1xx/CAN/halconf.h
+++ b/testhal/STM32/STM32F1xx/CAN/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/EXT/halconf.h b/testhal/STM32/STM32F1xx/EXT/halconf.h
index a813cb250..80ff7455a 100644
--- a/testhal/STM32/STM32F1xx/EXT/halconf.h
+++ b/testhal/STM32/STM32F1xx/EXT/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/I2C/halconf.h b/testhal/STM32/STM32F1xx/I2C/halconf.h
index d5da526da..6430fb283 100644
--- a/testhal/STM32/STM32F1xx/I2C/halconf.h
+++ b/testhal/STM32/STM32F1xx/I2C/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32F1xx/IRQ_STORM/halconf.h
index d02b92e5b..5bd391078 100644
--- a/testhal/STM32/STM32F1xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F1xx/IRQ_STORM/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F1xx/PWM-ICU/halconf.h
index f876b9d4a..1fd4d0f0e 100644
--- a/testhal/STM32/STM32F1xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F1xx/PWM-ICU/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/RTC/halconf.h b/testhal/STM32/STM32F1xx/RTC/halconf.h
index d00089de3..b69d4e1c7 100644
--- a/testhal/STM32/STM32F1xx/RTC/halconf.h
+++ b/testhal/STM32/STM32F1xx/RTC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/SPI/halconf.h b/testhal/STM32/STM32F1xx/SPI/halconf.h
index 98c99e9a6..b5f0e74a3 100644
--- a/testhal/STM32/STM32F1xx/SPI/halconf.h
+++ b/testhal/STM32/STM32F1xx/SPI/halconf.h
@@ -321,6 +321,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/UART/halconf.h b/testhal/STM32/STM32F1xx/UART/halconf.h
index 19ea70d0a..eb719b8e7 100644
--- a/testhal/STM32/STM32F1xx/UART/halconf.h
+++ b/testhal/STM32/STM32F1xx/UART/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/USB_CDC/halconf.h b/testhal/STM32/STM32F1xx/USB_CDC/halconf.h
index 9349c6dfb..6ebcb2107 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32F1xx/USB_CDC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F1xx/USB_CDC_F107/halconf.h b/testhal/STM32/STM32F1xx/USB_CDC_F107/halconf.h
index 9349c6dfb..6ebcb2107 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC_F107/halconf.h
+++ b/testhal/STM32/STM32F1xx/USB_CDC_F107/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F37x/ADC/halconf.h b/testhal/STM32/STM32F37x/ADC/halconf.h
index cf3d9b81e..f8b4e8c77 100644
--- a/testhal/STM32/STM32F37x/ADC/halconf.h
+++ b/testhal/STM32/STM32F37x/ADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F37x/CAN/halconf.h b/testhal/STM32/STM32F37x/CAN/halconf.h
index 1b1b02851..2f2b659e8 100644
--- a/testhal/STM32/STM32F37x/CAN/halconf.h
+++ b/testhal/STM32/STM32F37x/CAN/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F37x/EXT/halconf.h b/testhal/STM32/STM32F37x/EXT/halconf.h
index a813cb250..80ff7455a 100644
--- a/testhal/STM32/STM32F37x/EXT/halconf.h
+++ b/testhal/STM32/STM32F37x/EXT/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F37x/I2C/halconf.h b/testhal/STM32/STM32F37x/I2C/halconf.h
index d5da526da..6430fb283 100644
--- a/testhal/STM32/STM32F37x/I2C/halconf.h
+++ b/testhal/STM32/STM32F37x/I2C/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F37x/IRQ_STORM/halconf.h b/testhal/STM32/STM32F37x/IRQ_STORM/halconf.h
index d02b92e5b..5bd391078 100644
--- a/testhal/STM32/STM32F37x/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F37x/IRQ_STORM/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F37x/PWM-ICU/halconf.h b/testhal/STM32/STM32F37x/PWM-ICU/halconf.h
index f876b9d4a..1fd4d0f0e 100644
--- a/testhal/STM32/STM32F37x/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F37x/PWM-ICU/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F37x/SDADC/halconf.h b/testhal/STM32/STM32F37x/SDADC/halconf.h
index cf3d9b81e..f8b4e8c77 100644
--- a/testhal/STM32/STM32F37x/SDADC/halconf.h
+++ b/testhal/STM32/STM32F37x/SDADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F37x/SPI/halconf.h b/testhal/STM32/STM32F37x/SPI/halconf.h
index 3d6a61e6b..0312d81d3 100644
--- a/testhal/STM32/STM32F37x/SPI/halconf.h
+++ b/testhal/STM32/STM32F37x/SPI/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F37x/UART/halconf.h b/testhal/STM32/STM32F37x/UART/halconf.h
index 19ea70d0a..eb719b8e7 100644
--- a/testhal/STM32/STM32F37x/UART/halconf.h
+++ b/testhal/STM32/STM32F37x/UART/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F37x/USB_CDC/halconf.h b/testhal/STM32/STM32F37x/USB_CDC/halconf.h
index 9349c6dfb..6ebcb2107 100644
--- a/testhal/STM32/STM32F37x/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32F37x/USB_CDC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/ADC/halconf.h b/testhal/STM32/STM32F3xx/ADC/halconf.h
index cf3d9b81e..f8b4e8c77 100644
--- a/testhal/STM32/STM32F3xx/ADC/halconf.h
+++ b/testhal/STM32/STM32F3xx/ADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/ADC_DUAL/halconf.h b/testhal/STM32/STM32F3xx/ADC_DUAL/halconf.h
index cf3d9b81e..f8b4e8c77 100644
--- a/testhal/STM32/STM32F3xx/ADC_DUAL/halconf.h
+++ b/testhal/STM32/STM32F3xx/ADC_DUAL/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/CAN/halconf.h b/testhal/STM32/STM32F3xx/CAN/halconf.h
index 1b1b02851..2f2b659e8 100644
--- a/testhal/STM32/STM32F3xx/CAN/halconf.h
+++ b/testhal/STM32/STM32F3xx/CAN/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/DAC/halconf.h b/testhal/STM32/STM32F3xx/DAC/halconf.h
index 75a64cc1a..0f6406af1 100644
--- a/testhal/STM32/STM32F3xx/DAC/halconf.h
+++ b/testhal/STM32/STM32F3xx/DAC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/EXT/halconf.h b/testhal/STM32/STM32F3xx/EXT/halconf.h
index a813cb250..80ff7455a 100644
--- a/testhal/STM32/STM32F3xx/EXT/halconf.h
+++ b/testhal/STM32/STM32F3xx/EXT/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32F3xx/IRQ_STORM/halconf.h
index d02b92e5b..5bd391078 100644
--- a/testhal/STM32/STM32F3xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F3xx/IRQ_STORM/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F3xx/PWM-ICU/halconf.h
index f876b9d4a..1fd4d0f0e 100644
--- a/testhal/STM32/STM32F3xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F3xx/PWM-ICU/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/SPI/halconf.h b/testhal/STM32/STM32F3xx/SPI/halconf.h
index 3d6a61e6b..0312d81d3 100644
--- a/testhal/STM32/STM32F3xx/SPI/halconf.h
+++ b/testhal/STM32/STM32F3xx/SPI/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/UART/halconf.h b/testhal/STM32/STM32F3xx/UART/halconf.h
index 19ea70d0a..eb719b8e7 100644
--- a/testhal/STM32/STM32F3xx/UART/halconf.h
+++ b/testhal/STM32/STM32F3xx/UART/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/USB_CDC/halconf.h b/testhal/STM32/STM32F3xx/USB_CDC/halconf.h
index 9349c6dfb..6ebcb2107 100644
--- a/testhal/STM32/STM32F3xx/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32F3xx/USB_CDC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/USB_CDC_IAD/halconf.h b/testhal/STM32/STM32F3xx/USB_CDC_IAD/halconf.h
index 9349c6dfb..6ebcb2107 100644
--- a/testhal/STM32/STM32F3xx/USB_CDC_IAD/halconf.h
+++ b/testhal/STM32/STM32F3xx/USB_CDC_IAD/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F3xx/WDG/halconf.h b/testhal/STM32/STM32F3xx/WDG/halconf.h
index a9a0808b4..e83ab9229 100644
--- a/testhal/STM32/STM32F3xx/WDG/halconf.h
+++ b/testhal/STM32/STM32F3xx/WDG/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/ADC/halconf.h b/testhal/STM32/STM32F4xx/ADC/halconf.h
index cf3d9b81e..f8b4e8c77 100644
--- a/testhal/STM32/STM32F4xx/ADC/halconf.h
+++ b/testhal/STM32/STM32F4xx/ADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/CAN/halconf.h b/testhal/STM32/STM32F4xx/CAN/halconf.h
index 1b1b02851..2f2b659e8 100644
--- a/testhal/STM32/STM32F4xx/CAN/halconf.h
+++ b/testhal/STM32/STM32F4xx/CAN/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/DAC/halconf.h b/testhal/STM32/STM32F4xx/DAC/halconf.h
index 75a64cc1a..0f6406af1 100644
--- a/testhal/STM32/STM32F4xx/DAC/halconf.h
+++ b/testhal/STM32/STM32F4xx/DAC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/DAC_DUAL/halconf.h b/testhal/STM32/STM32F4xx/DAC_DUAL/halconf.h
index 75a64cc1a..0f6406af1 100644
--- a/testhal/STM32/STM32F4xx/DAC_DUAL/halconf.h
+++ b/testhal/STM32/STM32F4xx/DAC_DUAL/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/DMA_STORM/halconf.h b/testhal/STM32/STM32F4xx/DMA_STORM/halconf.h
index 163696fd8..0a559a8af 100644
--- a/testhal/STM32/STM32F4xx/DMA_STORM/halconf.h
+++ b/testhal/STM32/STM32F4xx/DMA_STORM/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/EXT/halconf.h b/testhal/STM32/STM32F4xx/EXT/halconf.h
index a813cb250..80ff7455a 100644
--- a/testhal/STM32/STM32F4xx/EXT/halconf.h
+++ b/testhal/STM32/STM32F4xx/EXT/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/GPT/halconf.h b/testhal/STM32/STM32F4xx/GPT/halconf.h
index 9c0f81d85..16c91499a 100644
--- a/testhal/STM32/STM32F4xx/GPT/halconf.h
+++ b/testhal/STM32/STM32F4xx/GPT/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/I2C/halconf.h b/testhal/STM32/STM32F4xx/I2C/halconf.h
index 1ea7de15f..be911d195 100644
--- a/testhal/STM32/STM32F4xx/I2C/halconf.h
+++ b/testhal/STM32/STM32F4xx/I2C/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/I2S/halconf.h b/testhal/STM32/STM32F4xx/I2S/halconf.h
index 498b5a287..bdc5a9b98 100644
--- a/testhal/STM32/STM32F4xx/I2S/halconf.h
+++ b/testhal/STM32/STM32F4xx/I2S/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32F4xx/IRQ_STORM/halconf.h
index d02b92e5b..5bd391078 100644
--- a/testhal/STM32/STM32F4xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F4xx/IRQ_STORM/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/halconf.h b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/halconf.h
index d02b92e5b..5bd391078 100644
--- a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/halconf.h
+++ b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F4xx/PWM-ICU/halconf.h
index f876b9d4a..1fd4d0f0e 100644
--- a/testhal/STM32/STM32F4xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F4xx/PWM-ICU/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/RTC/halconf.h b/testhal/STM32/STM32F4xx/RTC/halconf.h
index 95032181f..591221d99 100644
--- a/testhal/STM32/STM32F4xx/RTC/halconf.h
+++ b/testhal/STM32/STM32F4xx/RTC/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/SDC/halconf.h b/testhal/STM32/STM32F4xx/SDC/halconf.h
index 41c2940d7..c781ee1c5 100644
--- a/testhal/STM32/STM32F4xx/SDC/halconf.h
+++ b/testhal/STM32/STM32F4xx/SDC/halconf.h
@@ -336,6 +336,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/SPI/halconf.h b/testhal/STM32/STM32F4xx/SPI/halconf.h
index 3d6a61e6b..0312d81d3 100644
--- a/testhal/STM32/STM32F4xx/SPI/halconf.h
+++ b/testhal/STM32/STM32F4xx/SPI/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/UART/halconf.h b/testhal/STM32/STM32F4xx/UART/halconf.h
index 19ea70d0a..eb719b8e7 100644
--- a/testhal/STM32/STM32F4xx/UART/halconf.h
+++ b/testhal/STM32/STM32F4xx/UART/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/USB_CDC/halconf.h b/testhal/STM32/STM32F4xx/USB_CDC/halconf.h
index 8b489ef5c..a3f17b7ef 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32F4xx/USB_CDC/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h b/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h
index 8b489ef5c..a3f17b7ef 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h
+++ b/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F4xx/WDG/halconf.h b/testhal/STM32/STM32F4xx/WDG/halconf.h
index a9a0808b4..e83ab9229 100644
--- a/testhal/STM32/STM32F4xx/WDG/halconf.h
+++ b/testhal/STM32/STM32F4xx/WDG/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F7xx/GPT-ADC/halconf.h b/testhal/STM32/STM32F7xx/GPT-ADC/halconf.h
index 610cca3f8..28b91438e 100644
--- a/testhal/STM32/STM32F7xx/GPT-ADC/halconf.h
+++ b/testhal/STM32/STM32F7xx/GPT-ADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F7xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32F7xx/IRQ_STORM/halconf.h
index d02b92e5b..5bd391078 100644
--- a/testhal/STM32/STM32F7xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F7xx/IRQ_STORM/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F7xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F7xx/PWM-ICU/halconf.h
index 26d160b66..99f4e814a 100644
--- a/testhal/STM32/STM32F7xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F7xx/PWM-ICU/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F7xx/SPI/halconf.h b/testhal/STM32/STM32F7xx/SPI/halconf.h
index 861673682..669f33bfe 100644
--- a/testhal/STM32/STM32F7xx/SPI/halconf.h
+++ b/testhal/STM32/STM32F7xx/SPI/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F7xx/USB_CDC/halconf.h b/testhal/STM32/STM32F7xx/USB_CDC/halconf.h
index 8b489ef5c..a3f17b7ef 100644
--- a/testhal/STM32/STM32F7xx/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32F7xx/USB_CDC/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32F7xx/USB_RAW/halconf.h b/testhal/STM32/STM32F7xx/USB_RAW/halconf.h
index 5d26b614d..620564e56 100644
--- a/testhal/STM32/STM32F7xx/USB_RAW/halconf.h
+++ b/testhal/STM32/STM32F7xx/USB_RAW/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L0xx/ADC/halconf.h b/testhal/STM32/STM32L0xx/ADC/halconf.h
index cf3d9b81e..f8b4e8c77 100644
--- a/testhal/STM32/STM32L0xx/ADC/halconf.h
+++ b/testhal/STM32/STM32L0xx/ADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L0xx/EXT/halconf.h b/testhal/STM32/STM32L0xx/EXT/halconf.h
index a813cb250..80ff7455a 100644
--- a/testhal/STM32/STM32L0xx/EXT/halconf.h
+++ b/testhal/STM32/STM32L0xx/EXT/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L0xx/SPI/halconf.h b/testhal/STM32/STM32L0xx/SPI/halconf.h
index 3d6a61e6b..0312d81d3 100644
--- a/testhal/STM32/STM32L0xx/SPI/halconf.h
+++ b/testhal/STM32/STM32L0xx/SPI/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L1xx/ADC/halconf.h b/testhal/STM32/STM32L1xx/ADC/halconf.h
index cf3d9b81e..f8b4e8c77 100644
--- a/testhal/STM32/STM32L1xx/ADC/halconf.h
+++ b/testhal/STM32/STM32L1xx/ADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L1xx/DAC/halconf.h b/testhal/STM32/STM32L1xx/DAC/halconf.h
index 75a64cc1a..0f6406af1 100644
--- a/testhal/STM32/STM32L1xx/DAC/halconf.h
+++ b/testhal/STM32/STM32L1xx/DAC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L1xx/EXT/halconf.h b/testhal/STM32/STM32L1xx/EXT/halconf.h
index 00baf58fd..72feead07 100644
--- a/testhal/STM32/STM32L1xx/EXT/halconf.h
+++ b/testhal/STM32/STM32L1xx/EXT/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L1xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32L1xx/IRQ_STORM/halconf.h
index 57116c74c..1132e12c8 100644
--- a/testhal/STM32/STM32L1xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32L1xx/IRQ_STORM/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L1xx/PWM-ICU/halconf.h b/testhal/STM32/STM32L1xx/PWM-ICU/halconf.h
index 9643737e1..d831473bc 100644
--- a/testhal/STM32/STM32L1xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32L1xx/PWM-ICU/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L1xx/SPI/halconf.h b/testhal/STM32/STM32L1xx/SPI/halconf.h
index c8c9b2e7f..81a4e30c3 100644
--- a/testhal/STM32/STM32L1xx/SPI/halconf.h
+++ b/testhal/STM32/STM32L1xx/SPI/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L1xx/UART/halconf.h b/testhal/STM32/STM32L1xx/UART/halconf.h
index 8a0009e86..cc55e71d1 100644
--- a/testhal/STM32/STM32L1xx/UART/halconf.h
+++ b/testhal/STM32/STM32L1xx/UART/halconf.h
@@ -329,6 +329,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L4xx/CAN/halconf.h b/testhal/STM32/STM32L4xx/CAN/halconf.h
index 1b1b02851..2f2b659e8 100644
--- a/testhal/STM32/STM32L4xx/CAN/halconf.h
+++ b/testhal/STM32/STM32L4xx/CAN/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */
diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/halconf.h b/testhal/STM32/STM32L4xx/GPT-ADC/halconf.h
index 610cca3f8..28b91438e 100644
--- a/testhal/STM32/STM32L4xx/GPT-ADC/halconf.h
+++ b/testhal/STM32/STM32L4xx/GPT-ADC/halconf.h
@@ -322,6 +322,7 @@
  */
 #if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
 #define SERIAL_USB_BUFFERS_NUMBER   2
+#endif
 
 /*===========================================================================*/
 /* SPI driver related settings.                                              */