diff --git a/environments/sp/component.cmake b/environments/sp/component.cmake
index 35532bd..5644ed1 100644
--- a/environments/sp/component.cmake
+++ b/environments/sp/component.cmake
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -36,7 +36,12 @@
 	SP_HEAP_SIZE=${SP_HEAP_SIZE}
 )
 
-include(${TS_ROOT}/external/newlib/newlib.cmake)
+add_subdirectory(${TS_ROOT}/components/common/libc ${CMAKE_BINARY_DIR}/libc_build)
+add_components(TARGET ${TGT}
+	BASE_DIR ${TS_ROOT}
+	COMPONENTS
+		"components/common/dlmalloc"
+)
 
 target_link_libraries(${TGT} PRIVATE
 	stdlib::c
diff --git a/environments/sp/sp_assert.c b/environments/sp/sp_assert.c
index 8f336e7..69f7b74 100644
--- a/environments/sp/sp_assert.c
+++ b/environments/sp/sp_assert.c
@@ -1,17 +1,16 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /*
- * Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2021-2024, Arm Limited and Contributors. All rights reserved.
  */
 
-#include "assert_fail_handler.h"
-#include "compiler.h"
+#include "libc_platform.h"
 #include "trace.h"
 
 /*
  * The generic trace function called on assert fail.
  */
-void __noreturn assert_fail_handler(const char *file, int line,
-				    const char *func, const char *failedexpr)
+void __noreturn platform_assert(const char *file, int line, const char *func,
+				const char *failedexpr)
 {
 #if TRACE_LEVEL >= TRACE_LEVEL_ERROR
 	trace_printf(func, line, TRACE_LEVEL_ERROR, "assertion %s failed", failedexpr);
@@ -20,3 +19,13 @@
 	while (1)
 		;
 }
+
+void __noreturn platform_abort(void)
+{
+#if TRACE_LEVEL >= TRACE_LEVEL_ERROR
+	trace_puts("abort()");
+#endif /* TRACE_LEVEL */
+
+	while (1)
+		;
+}
diff --git a/environments/sp/sp_entry.c b/environments/sp/sp_entry.c
index c9b2510..f683646 100644
--- a/environments/sp/sp_entry.c
+++ b/environments/sp/sp_entry.c
@@ -1,12 +1,11 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /*
- * Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2021-2024, Arm Limited and Contributors. All rights reserved.
  */
 
 #include <stddef.h>
 #include <stdint.h>
 #include "compiler.h"
-#include "libc_init.h"
 #include "sp_api.h"
 
 /*
@@ -24,7 +23,5 @@
 	(void)a2;
 	(void)a3;
 
-	libc_init();
-
 	sp_main((union ffa_boot_info *)a0);
 }