diff --git a/include/arch/aarch64/setjmp.h b/include/lib/libc/aarch64/setjmp_.h
similarity index 79%
rename from include/arch/aarch64/setjmp.h
rename to include/lib/libc/aarch64/setjmp_.h
index f7991fd..174b3eb 100644
--- a/include/arch/aarch64/setjmp.h
+++ b/include/lib/libc/aarch64/setjmp_.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef SETJMP_H
-#define SETJMP_H
+#ifndef SETJMP__H
+#define SETJMP__H
 
 #define JMP_CTX_X19	0x0
 #define JMP_CTX_X21	0x10
@@ -21,13 +21,10 @@
 #ifndef __ASSEMBLY__
 
 #include <cdefs.h>
-#include <stdint.h>
 
 /* Jump buffer hosting x18 - x30 and sp_el0 registers */
 typedef uint64_t jmp_buf[JMP_SIZE] __aligned(16);
 
-int setjmp(jmp_buf env);
-__dead2 void longjmp(jmp_buf env, int val);
-
 #endif /* __ASSEMBLY__ */
-#endif /* SETJMP_H */
+
+#endif /* SETJMP__H */
diff --git a/include/lib/libc/setjmp.h b/include/lib/libc/setjmp.h
new file mode 100644
index 0000000..5661201
--- /dev/null
+++ b/include/lib/libc/setjmp.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef SETJMP_H
+#define SETJMP_H
+
+#include <setjmp_.h>
+
+#ifndef __ASSEMBLY__
+
+#include <cdefs.h>
+
+int setjmp(jmp_buf env);
+__dead2 void longjmp(jmp_buf env, int val);
+
+#endif /* __ASSEMBLY__ */
+#endif /* SETJMP_H */