diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index fd4c1972f..cfc07635a 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -112,6 +112,7 @@ INCLUDE_PATH += include/common
 INCLUDE_PATH += include/arch/x86
 INCLUDE_PATH += include/arch/x86/boot
 INCLUDE_PATH += include/arch/x86/guest
+INCLUDE_PATH += include/arch/x86/lib
 INCLUDE_PATH += include/debug
 INCLUDE_PATH += include/public
 INCLUDE_PATH += include/dm
@@ -208,8 +209,8 @@ C_SRCS += arch/x86/guest/vmexit.c
 S_SRCS += arch/x86/guest/vmx_asm.S
 C_SRCS += arch/x86/guest/trusty.c
 C_SRCS += arch/x86/cat.c
+C_SRCS += arch/x86/lib/memory.c
 C_SRCS += lib/string.c
-C_SRCS += lib/memory.c
 C_SRCS += lib/crypto/crypto_api.c
 C_SRCS += lib/crypto/mbedtls/hkdf.c
 C_SRCS += lib/crypto/mbedtls/sha256.c
diff --git a/hypervisor/lib/memory.c b/hypervisor/arch/x86/lib/memory.c
similarity index 100%
rename from hypervisor/lib/memory.c
rename to hypervisor/arch/x86/lib/memory.c
diff --git a/hypervisor/include/lib/atomic.h b/hypervisor/include/arch/x86/lib/atomic.h
similarity index 100%
rename from hypervisor/include/lib/atomic.h
rename to hypervisor/include/arch/x86/lib/atomic.h
diff --git a/hypervisor/include/lib/bits.h b/hypervisor/include/arch/x86/lib/bits.h
similarity index 100%
rename from hypervisor/include/lib/bits.h
rename to hypervisor/include/arch/x86/lib/bits.h
diff --git a/hypervisor/include/lib/spinlock.h b/hypervisor/include/arch/x86/lib/spinlock.h
similarity index 100%
rename from hypervisor/include/lib/spinlock.h
rename to hypervisor/include/arch/x86/lib/spinlock.h