diff --git a/.gitmodules b/.gitmodules
index 2a682bd..b985a6f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "src/incbin"]
-	path = src/incbin
+	path = lib/incbin
 	url = https://github.com/graphitemaster/incbin
 [submodule "src/tomlc99"]
-	path = src/tomlc99
+	path = lib/tomlc99
 	url = https://github.com/cktan/tomlc99
diff --git a/src/incbin b/lib/incbin
similarity index 100%
rename from src/incbin
rename to lib/incbin
diff --git a/src/tomlc99 b/lib/tomlc99
similarity index 100%
rename from src/tomlc99
rename to lib/tomlc99
diff --git a/meson.build b/meson.build
index 5190e1e..ed72b62 100644
--- a/meson.build
+++ b/meson.build
@@ -78,7 +78,6 @@ else
 endif
 
 # Hardware libraries
-
 HW_SRC = {
 	'ADB':  [
 		'src/HW/ADB/ADBEMDEV.c'
@@ -177,12 +176,13 @@ EMU_SRC = [
 	'src/PATCHES/ROMEMDEV.c',
 	'src/UTIL/DATE2SEC.c',
 	'src/LANG/INTLCHAR.c',
-	'src/tomlc99/toml.c'
+	'lib/tomlc99/toml.c',
 ]
 
 EMU_INC = include_directories([
 	'cfg/',
 	'src/',
+	'lib/'
 ])
 
 ## Final compiled program definition