diff --git a/os/hal/templates/pal_lld.h b/os/hal/templates/pal_lld.h
index d8be65452..5b39648c2 100644
--- a/os/hal/templates/pal_lld.h
+++ b/os/hal/templates/pal_lld.h
@@ -94,17 +94,6 @@ typedef struct {
 
 } PALConfig;
 
-/**
- * @brief   Width, in bits, of an I/O port.
- */
-#define PAL_IOPORTS_WIDTH 32U
-
-/**
- * @brief   Whole port mask.
- * @brief   This macro specifies all the valid bits into a port.
- */
-#define PAL_WHOLE_PORT ((ioportmask_t)0xFFFFFFFFU)
-
 /**
  * @brief   Digital I/O port sized unsigned type.
  */
diff --git a/os/hal/templates/usb_lld.h b/os/hal/templates/usb_lld.h
index 3d6764bc6..e1c237a6a 100644
--- a/os/hal/templates/usb_lld.h
+++ b/os/hal/templates/usb_lld.h
@@ -93,8 +93,13 @@ typedef struct {
    * @brief   Pointer to the transmission linear buffer.
    */
   const uint8_t                 *txbuf;
+#if (USB_USE_WAIT == TRUE) || defined(__DOXYGEN__)
+  /**
+   * @brief   Waiting thread.
+   */
+  thread_reference_t            thread;
+#endif
     /* End of the mandatory fields.*/
-  } mode;
 } USBInEndpointState;
 
 /**
@@ -113,6 +118,12 @@ typedef struct {
    * @brief   Pointer to the receive linear buffer.
    */
   uint8_t                       *rxbuf;
+#if (USB_USE_WAIT == TRUE) || defined(__DOXYGEN__)
+  /**
+   * @brief   Waiting thread.
+   */
+  thread_reference_t            thread;
+#endif
   /* End of the mandatory fields.*/
 } USBOutEndpointState;
 
diff --git a/os/hal/templates/wdg_lld.h b/os/hal/templates/wdg_lld.h
index d49dac8ac..d10af5add 100644
--- a/os/hal/templates/wdg_lld.h
+++ b/os/hal/templates/wdg_lld.h
@@ -41,11 +41,10 @@
  */
 /**
  * @brief   WDG1 driver enable switch.
- * @details If set to @p TRUE the support for IWDG is included.
  * @note    The default is @p FALSE.
  */
-#if !defined(STM32_WDG_USE_WDG1) || defined(__DOXYGEN__)
-#define STM32_WDG_USE_WDG1                  FALSE
+#if !defined(PLATFORM_WDG_USE_WDG1) || defined(__DOXYGEN__)
+#define PLATFORM_WDG_USE_WDG1                  FALSE
 #endif
 /** @} */
 
@@ -92,7 +91,7 @@ struct WDGDriver {
 /* External declarations.                                                    */
 /*===========================================================================*/
 
-#if STM32_WDG_USE_IWDG && !defined(__DOXYGEN__)
+#if PLATFORM_WDG_USE_WDG1 && !defined(__DOXYGEN__)
 extern WDGDriver WDGD1;
 #endif