diff --git a/demos/ARM7-LPC214x-FATFS-GCC/chconf.h b/demos/ARM7-LPC214x-FATFS-GCC/chconf.h
index c49dc7571..6522e0b3b 100644
--- a/demos/ARM7-LPC214x-FATFS-GCC/chconf.h
+++ b/demos/ARM7-LPC214x-FATFS-GCC/chconf.h
@@ -478,10 +478,10 @@ struct {                                                                \
 }
 #endif
 
-#endif  /* _CHCONF_H_ */
-
 /*===========================================================================*/
 /* Port-specific settings (override port settings defaulted in chcore.h).    */
 /*===========================================================================*/
 
+#endif  /* _CHCONF_H_ */
+
 /** @} */
diff --git a/demos/ARM7-LPC214x-G++/chconf.h b/demos/ARM7-LPC214x-G++/chconf.h
index c49dc7571..6522e0b3b 100644
--- a/demos/ARM7-LPC214x-G++/chconf.h
+++ b/demos/ARM7-LPC214x-G++/chconf.h
@@ -478,10 +478,10 @@ struct {                                                                \
 }
 #endif
 
-#endif  /* _CHCONF_H_ */
-
 /*===========================================================================*/
 /* Port-specific settings (override port settings defaulted in chcore.h).    */
 /*===========================================================================*/
 
+#endif  /* _CHCONF_H_ */
+
 /** @} */
diff --git a/demos/ARMCM0-LPC1114-GCC/chconf.h b/demos/ARMCM0-LPC1114-GCC/chconf.h
index c49dc7571..6522e0b3b 100644
--- a/demos/ARMCM0-LPC1114-GCC/chconf.h
+++ b/demos/ARMCM0-LPC1114-GCC/chconf.h
@@ -478,10 +478,10 @@ struct {                                                                \
 }
 #endif
 
-#endif  /* _CHCONF_H_ */
-
 /*===========================================================================*/
 /* Port-specific settings (override port settings defaulted in chcore.h).    */
 /*===========================================================================*/
 
+#endif  /* _CHCONF_H_ */
+
 /** @} */
diff --git a/demos/Posix-GCC/chconf.h b/demos/Posix-GCC/chconf.h
index c1aa2b710..59a895f70 100644
--- a/demos/Posix-GCC/chconf.h
+++ b/demos/Posix-GCC/chconf.h
@@ -480,10 +480,10 @@ struct {                                                                \
 
 #define chThdGetExitEventSource(tp) (&(tp)->p_exitesource)
 
-#endif  /* _CHCONF_H_ */
-
 /*===========================================================================*/
 /* Port-specific settings (override port settings defaulted in chcore.h).    */
 /*===========================================================================*/
 
+#endif  /* _CHCONF_H_ */
+
 /** @} */