diff --git a/lib/libesp32_div/ESP32-HomeKit/src/hap_platform_memory.c b/lib/libesp32_div/ESP32-HomeKit/src/hap_platform_memory.cpp
similarity index 83%
rename from lib/libesp32_div/ESP32-HomeKit/src/hap_platform_memory.c
rename to lib/libesp32_div/ESP32-HomeKit/src/hap_platform_memory.cpp
index 361cd3e5f..ad63fc0fc 100644
--- a/lib/libesp32_div/ESP32-HomeKit/src/hap_platform_memory.c
+++ b/lib/libesp32_div/ESP32-HomeKit/src/hap_platform_memory.cpp
@@ -23,17 +23,25 @@
  */
 #include <stdlib.h>
 
+//Tasmota Patch
+extern void *special_malloc(uint32_t size);
+extern void *special_calloc(size_t num, size_t size);
+
+extern "C" {
 void * hap_platform_memory_malloc(size_t size)
 {
-    return malloc(size);
+    return special_malloc((uint32_t)size);
+    // return malloc(size);
 }
 
 void * hap_platform_memory_calloc(size_t count, size_t size)
 {
-    return calloc(count, size);
+    return special_calloc(count,size);
+    // return calloc(count, size);
 }
 
 void hap_platform_memory_free(void *ptr)
 {
     free(ptr);
 }
+} //extern "C"
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.c
deleted file mode 100644
index 7e1899db6..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifdef ESP_PLATFORM
-
-#include "esp_attr.h"
-#include "esp_heap_caps.h"
-#include "nimconfig.h"
-#include "../include/esp_nimble_mem.h"
-
-IRAM_ATTR void *nimble_platform_mem_malloc(size_t size)
-{
-#ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
-    return heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
-#elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
-    return heap_caps_malloc(size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
-#elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
-    return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
-#else
-    return malloc(size);
-#endif
-}
-
-IRAM_ATTR void *nimble_platform_mem_calloc(size_t n, size_t size)
-{
-#ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
-    return heap_caps_calloc(n, size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
-#elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
-    return heap_caps_calloc(n, size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
-#elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
-    return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
-#else
-    return calloc(n, size);
-#endif
-}
-
-IRAM_ATTR void nimble_platform_mem_free(void *ptr)
-{
-    heap_caps_free(ptr);
-}
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.cpp b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.cpp
new file mode 100644
index 000000000..407091c7f
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.cpp
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifdef ESP_PLATFORM
+
+#include "esp_attr.h"
+#include "esp_heap_caps.h"
+#include "nimconfig.h"
+#include "../include/esp_nimble_mem.h"
+
+//Tasmota Patch
+extern void *special_malloc(uint32_t size);
+extern void *special_calloc(size_t num, size_t size);
+
+
+extern "C" {
+IRAM_ATTR void *nimble_platform_mem_malloc(size_t size)
+{
+    return special_malloc((uint32_t)size);
+// #ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
+//     return heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
+// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
+//     return heap_caps_malloc(size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
+// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
+//     return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
+// #else
+//     return malloc(size);
+// #endif
+}
+
+IRAM_ATTR void *nimble_platform_mem_calloc(size_t n, size_t size)
+{
+    return special_calloc(n,size);
+// #ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
+//     return heap_caps_calloc(n, size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
+// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
+//     return heap_caps_calloc(n, size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
+// #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
+//     return heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
+// #else
+//     return calloc(n, size);
+// #endif
+}
+
+IRAM_ATTR void nimble_platform_mem_free(void *ptr)
+{
+    heap_caps_free(ptr);
+}
+} //extern "C"
+#endif