diff --git a/os/various/cpp_wrappers/ch.cpp b/os/various/cpp_wrappers/ch.cpp
index d566f579e..54cf74692 100644
--- a/os/various/cpp_wrappers/ch.cpp
+++ b/os/various/cpp_wrappers/ch.cpp
@@ -66,6 +66,7 @@ namespace chibios_rt {
   /*------------------------------------------------------------------------*
    * chibios_rt::Core                                                       *
    *------------------------------------------------------------------------*/
+#if CH_CFG_USE_MEMCORE
   void *Core::alloc(size_t size) {
 
     return chCoreAlloc(size);
@@ -80,6 +81,7 @@ namespace chibios_rt {
 
     return chCoreGetStatusX();
   }
+#endif /* CH_CFG_USE_MEMCORE */
 
   /*------------------------------------------------------------------------*
    * chibios_rt::Timer                                                      *
diff --git a/os/various/cpp_wrappers/ch.hpp b/os/various/cpp_wrappers/ch.hpp
index ab415c5d2..e50aa6df6 100644
--- a/os/various/cpp_wrappers/ch.hpp
+++ b/os/various/cpp_wrappers/ch.hpp
@@ -127,6 +127,7 @@ namespace chibios_rt {
     static bool isTimeWithin(systime_t start, systime_t end);
   };
 
+#if CH_CFG_USE_MEMCORE || defined(__DOXYGEN__)
   /*------------------------------------------------------------------------*
    * chibios_rt::System                                                     *
    *------------------------------------------------------------------------*/
@@ -173,6 +174,7 @@ namespace chibios_rt {
      */
     static size_t getStatus(void);
   };
+#endif /* CH_CFG_USE_MEMCORE */
 
   /*------------------------------------------------------------------------*
    * chibios_rt::Timer                                                      *