diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..926977c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "external/core"]
+	path = external/core
+	url = https://android.googlesource.com/platform/system/core
+[submodule "external/libbase"]
+	path = external/libbase
+	url = https://android.googlesource.com/platform/system/libbase
+[submodule "external/libfmq"]
+	path = external/libfmq
+	url = https://android.googlesource.com/platform/system/libfmq
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 173ebf2..267c15f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,13 @@ set(CMAKE_CXX_STANDARD 20)
 project("ViPER4Android")
 add_compile_definitions(VIPER_VERSION=20240314)
 
+# External
+include_directories(
+        external/libbase/include
+        external/core/include
+        external/libfmq/include
+        external/libfmq/base)
+
 # AIDL
 set(AIDL_SRC
         generated/android/media/audio/common/AudioPortDeviceExt.cpp
@@ -135,12 +142,10 @@ set(AIDL_SRC
         generated/android/hardware/common/fmq/GrantorDescriptor.cpp
         generated/android/hardware/common/fmq/UnsynchronizedWrite.cpp)
 
-set(AIDL_INCLUDE_DIRS
-        generated/include)
+include_directories(generated/include)
 
 # ViPERFX
 include_directories(src/include)
-include_directories(${AIDL_INCLUDE_DIRS})
 
 set(FILES
         # Main
diff --git a/external/core b/external/core
new file mode 160000
index 0000000..00c7fec
--- /dev/null
+++ b/external/core
@@ -0,0 +1 @@
+Subproject commit 00c7fec1bb09f3284aad6a6f96d2f63dfc3650ad
diff --git a/external/libbase b/external/libbase
new file mode 160000
index 0000000..8f0ba41
--- /dev/null
+++ b/external/libbase
@@ -0,0 +1 @@
+Subproject commit 8f0ba417480079999ba552f1087ae592091b9d02
diff --git a/external/libfmq b/external/libfmq
new file mode 160000
index 0000000..be431cd
--- /dev/null
+++ b/external/libfmq
@@ -0,0 +1 @@
+Subproject commit be431cd81a9a2349eaea34eb56fcf6d1608da596