1 files changed, 13 insertions, 6 deletions
diff --git a/os/rt/include/ch.h b/os/rt/include/ch.h
index e11a049ac..d3bd8217b 100644
--- a/os/rt/include/ch.h
+++ b/os/rt/include/ch.h
@@ -66,7 +66,7 @@
 #define CH_KERNEL_PATCH         0
 /** @} */
 
-/* Core headers.*/
+/* Configuration headers and checks.*/
 #include "chtypes.h"
 #include "chconf.h"
 
@@ -78,12 +78,23 @@
 #error "obsolete or unknown configuration file"
 #endif
 
+/* Early function prototypes required by the following headers.*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+  void chSysHalt(const char *reason);
+#ifdef __cplusplus
+}
+#endif
+
+/* Including everything else.*/
 #include "chlicense.h"
 #include "chchecks.h"
 #include "chsystypes.h"
+#include "chdebug.h"
+#include "chtime.h"
 #include "chalign.h"
 #include "chcore.h"
-#include "chdebug.h"
 #include "chtrace.h"
 #include "chtm.h"
 #include "chstats.h"
@@ -108,10 +119,6 @@
 #include "chfactory.h"
 #include "chdynamic.h"
 
-#if !defined(_CHIBIOS_RT_CONF_)
-#error "missing or wrong configuration file"
-#endif
-
 #endif /* CH_H */
 
 /** @} */