diff --git a/os/hal/include/mac.h b/os/hal/include/mac.h
index 0d7a3d76e..85da4fc57 100644
--- a/os/hal/include/mac.h
+++ b/os/hal/include/mac.h
@@ -41,6 +41,10 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+#if !CH_USE_SEMAPHORES || !CH_USE_EVENTS
+#error "the MAC driver requires CH_USE_SEMAPHORES and CH_USE_EVENTS"
+#endif
+
 /*===========================================================================*/
 /* Driver data structures and types.                                         */
 /*===========================================================================*/
diff --git a/os/hal/include/mmc_spi.h b/os/hal/include/mmc_spi.h
index da2ed573c..2be2673fb 100644
--- a/os/hal/include/mmc_spi.h
+++ b/os/hal/include/mmc_spi.h
@@ -89,8 +89,8 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if !CH_USE_EVENTS
-#error "MMC_SPI driver requires CH_USE_EVENTS"
+#if !CH_HAL_USE_SPI || !CH_USE_EVENTS
+#error "MMC_SPI driver requires CH_HAL_USE_SPI and CH_USE_EVENTS"
 #endif
 
 /*===========================================================================*/
diff --git a/os/hal/include/serial.h b/os/hal/include/serial.h
index 3f4a1a8ca..a2d75713e 100644
--- a/os/hal/include/serial.h
+++ b/os/hal/include/serial.h
@@ -77,6 +77,10 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+#if !CH_USE_QUEUES && !CH_USE_EVENTS
+#error "Serial Driver requires CH_USE_QUEUES and CH_USE_EVENTS"
+#endif
+
 /*===========================================================================*/
 /* Driver data structures and types.                                         */
 /*===========================================================================*/
diff --git a/os/hal/platforms/AT91SAM7/mac_lld.h b/os/hal/platforms/AT91SAM7/mac_lld.h
index 88f85adc2..155439d7a 100644
--- a/os/hal/platforms/AT91SAM7/mac_lld.h
+++ b/os/hal/platforms/AT91SAM7/mac_lld.h
@@ -112,10 +112,6 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if !CH_USE_SEMAPHORES || !CH_USE_EVENTS
-#error "the MAC driver requires CH_USE_SEMAPHORES and CH_USE_EVENTS"
-#endif
-
 /*===========================================================================*/
 /* Driver data structures and types.                                         */
 /*===========================================================================*/
diff --git a/os/hal/templates/mac_lld.h b/os/hal/templates/mac_lld.h
index 74fde5f59..1fda8b8da 100644
--- a/os/hal/templates/mac_lld.h
+++ b/os/hal/templates/mac_lld.h
@@ -62,10 +62,6 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if !CH_USE_SEMAPHORES || !CH_USE_EVENTS
-#error "the MAC driver requires CH_USE_SEMAPHORES and CH_USE_EVENTS"
-#endif
-
 /*===========================================================================*/
 /* Driver data structures and types.                                         */
 /*===========================================================================*/