diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 45008859194..7b749fd2926 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -2087,6 +2087,10 @@ end
 ---------------------------------------------------
 --
 --@src/devices/bus/ti99x/990_dk.h,BUSES["TI99X"] = true
+--@src/devices/bus/ti99x/990_tap.h,BUSES["TI99X"] = true
+--@src/devices/bus/ti99x/990_hd.h,BUSES["TI99X"] = true
+--@src/devices/bus/ti99x/genboard.h,BUSES["TI99X"] = true
+--@src/devices/bus/ti99x/joyport.h,BUSES["TI99X"] = true
 ---------------------------------------------------
 
 if (BUSES["TI99X"]~=null) then
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 37edb734a04..53f09b3abc0 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1925,6 +1925,7 @@ end
 --@src/devices/cpu/tms9900/tms9900.h,CPUS["TMS9900"] = true
 --@src/devices/cpu/tms9900/tms9980a.h,CPUS["TMS9900"] = true
 --@src/devices/cpu/tms9900/tms9995.h,CPUS["TMS9900"] = true
+--@src/devices/cpu/tms9900/ti990_10.h,CPUS["TMS9900"] = true
 --------------------------------------------------
 
 if (CPUS["TMS9900"]~=null) then
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index aa908917069..9597c310fd4 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -2831,3 +2831,14 @@ if (MACHINES["WATCHDOG"]~=null) then
 	}
 end
 
+
+---------------------------------------------------
+--
+--@src/devices/machine/smartmed.h,MACHINES["SMARTMEDIA"] = true
+---------------------------------------------------
+if (MACHINES["SMARTMEDIA"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/smartmed.cpp",
+		MAME_DIR .. "src/devices/machine/smartmed.h",
+	}
+end
\ No newline at end of file
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 0afa846abf3..f21fa753297 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -578,6 +578,7 @@ MACHINES["VT82C496"] = true
 MACHINES["GENPC"] = true
 MACHINES["GEN_LATCH"] = true
 MACHINES["WATCHDOG"] = true
+MACHINES["SMARTMEDIA"] = true
 
 --------------------------------------------------
 -- specify available bus cores
@@ -1076,8 +1077,6 @@ files {
 	MAME_DIR .. "src/mame/machine/applefdc.h",
 	MAME_DIR .. "src/mame/machine/microdrv.cpp",
 	MAME_DIR .. "src/mame/machine/microdrv.h",
-	MAME_DIR .. "src/mame/machine/smartmed.cpp",
-	MAME_DIR .. "src/mame/machine/smartmed.h",
 	MAME_DIR .. "src/mame/machine/sonydriv.cpp",
 	MAME_DIR .. "src/mame/machine/sonydriv.h",
 	MAME_DIR .. "src/mame/machine/teleprinter.cpp",
diff --git a/src/mame/machine/smartmed.cpp b/src/devices/machine/smartmed.cpp
similarity index 100%
rename from src/mame/machine/smartmed.cpp
rename to src/devices/machine/smartmed.cpp
diff --git a/src/mame/machine/smartmed.h b/src/devices/machine/smartmed.h
similarity index 100%
rename from src/mame/machine/smartmed.h
rename to src/devices/machine/smartmed.h