diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index e38c6084a9a..f541ea6988f 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1510,9 +1510,9 @@ end
 --@src/devices/cpu/m6502/m740.h,CPUS["M6502"] = true
 --@src/devices/cpu/m6502/m3745x.h,CPUS["M6502"] = true
 --@src/devices/cpu/m6502/m5074x.h,CPUS["M6502"] = true
---@src/devices/cpu/m6502/st2xxx.h,CPUS["M6502"] = true
---@src/devices/cpu/m6502/st2204.h,CPUS["M6502"] = true
---@src/devices/cpu/m6502/st2205u.h,CPUS["M6502"] = true
+--@src/devices/cpu/m6502/st2xxx.h,CPUS["ST2XXX"] = true
+--@src/devices/cpu/m6502/st2204.h,CPUS["ST2XXX"] = true
+--@src/devices/cpu/m6502/st2205u.h,CPUS["ST2XXX"] = true
 --@src/devices/cpu/m6502/xavix.h,CPUS["XAVIX"] = true
 --@src/devices/cpu/m6502/xavix.h,CPUS["XAVIX2000"] = true
 
@@ -1560,16 +1560,6 @@ if (CPUS["M6502"]~=null) then
 		MAME_DIR .. "src/devices/cpu/m6502/m3745x.h",
 		MAME_DIR .. "src/devices/cpu/m6502/m5074x.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m5074x.h",
-		MAME_DIR .. "src/devices/cpu/m6502/st2xxx.cpp",
-		MAME_DIR .. "src/devices/cpu/m6502/st2xxx.h",
-		MAME_DIR .. "src/devices/cpu/m6502/st2204.cpp",
-		MAME_DIR .. "src/devices/cpu/m6502/st2204.h",
-		MAME_DIR .. "src/devices/cpu/m6502/st2205u.cpp",
-		MAME_DIR .. "src/devices/cpu/m6502/st2205u.h",
-		MAME_DIR .. "src/devices/cpu/m6502/xavix.cpp",
-		MAME_DIR .. "src/devices/cpu/m6502/xavix.h",
-		MAME_DIR .. "src/devices/cpu/m6502/xavix2000.cpp",
-		MAME_DIR .. "src/devices/cpu/m6502/xavix2000.h",
 	}
 
 	custombuildtask {
@@ -1584,9 +1574,6 @@ if (CPUS["M6502"]~=null) then
 		{ MAME_DIR .. "src/devices/cpu/m6502/om740.lst" ,   GEN_DIR .. "emu/cpu/m6502/m740.hxx",    { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dm740.lst"    }, {"@echo Generating m740 disassembler source file...", PYTHON .. " $(1) s m740 $(<) $(2) $(@)" }},
 		{ MAME_DIR .. "src/devices/cpu/m6502/dr65c02.lst",  GEN_DIR .. "emu/cpu/m6502/r65c02.hxx",  { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",                                                     }, {"@echo Generating r65c02 disassembler source file...", PYTHON .. " $(1) s r65c02 - $(<) $(@)" }},
 		{ MAME_DIR .. "src/devices/cpu/m6502/or65c19.lst",  GEN_DIR .. "emu/cpu/m6502/r65c19.hxx",  { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dr65c19.lst"  }, {"@echo Generating r65c19 disassembler source file...", PYTHON .. " $(1) s r65c19 $(<) $(2) $(@)" }},
-		{ MAME_DIR .. "src/devices/cpu/m6502/ost2xxx.lst" , GEN_DIR .. "emu/cpu/m6502/st2xxx.hxx",  { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dst2xxx.lst"  }, {"@echo Generating st2xxx disassembler source file...", PYTHON .. " $(1) s st2xxx $(<) $(2) $(@)" }},
-		{ MAME_DIR .. "src/devices/cpu/m6502/oxavix.lst",   GEN_DIR .. "emu/cpu/m6502/xavix.hxx",   { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dxavix.lst"   }, {"@echo Generating xavix disassembler source file...", PYTHON .. " $(1) s xavix $(<) $(2) $(@)" }},
-		{ MAME_DIR .. "src/devices/cpu/m6502/oxavix2000.lst",   GEN_DIR .. "emu/cpu/m6502/xavix2000.hxx",   { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dxavix2000.lst"   }, {"@echo Generating xavix2000 disassembler source file...", PYTHON .. " $(1) s xavix2000 $(<) $(2) $(@)" }},
 	}
 
 	dependency {
@@ -1601,8 +1588,54 @@ if (CPUS["M6502"]~=null) then
 		{ MAME_DIR .. "src/devices/cpu/m6502/r65c02.cpp",   GEN_DIR .. "emu/cpu/m6502/r65c02.hxx" },
 		{ MAME_DIR .. "src/devices/cpu/m6502/r65c19.cpp",   GEN_DIR .. "emu/cpu/m6502/r65c19.hxx" },
 		{ MAME_DIR .. "src/devices/cpu/m6502/m740.cpp",     GEN_DIR .. "emu/cpu/m6502/m740.hxx" },
+	}
+end
+
+if (CPUS["ST2XXX"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/cpu/m6502/st2xxx.cpp",
+		MAME_DIR .. "src/devices/cpu/m6502/st2xxx.h",
+		MAME_DIR .. "src/devices/cpu/m6502/st2204.cpp",
+		MAME_DIR .. "src/devices/cpu/m6502/st2204.h",
+		MAME_DIR .. "src/devices/cpu/m6502/st2205u.cpp",
+		MAME_DIR .. "src/devices/cpu/m6502/st2205u.h",
+	}
+
+	custombuildtask {
+		{ MAME_DIR .. "src/devices/cpu/m6502/ost2xxx.lst" , GEN_DIR .. "emu/cpu/m6502/st2xxx.hxx",  { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dst2xxx.lst"  }, {"@echo Generating st2xxx disassembler source file...", PYTHON .. " $(1) s st2xxx $(<) $(2) $(@)" }},
+	}
+
+	dependency {
 		{ MAME_DIR .. "src/devices/cpu/m6502/st2xxx.cpp",   GEN_DIR .. "emu/cpu/m6502/st2xxx.hxx" },
+	}
+end
+
+if (CPUS["XAVIX"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/cpu/m6502/xavix.cpp",
+		MAME_DIR .. "src/devices/cpu/m6502/xavix.h",
+	}
+
+	custombuildtask {
+		{ MAME_DIR .. "src/devices/cpu/m6502/oxavix.lst",   GEN_DIR .. "emu/cpu/m6502/xavix.hxx",   { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dxavix.lst"   }, {"@echo Generating xavix disassembler source file...", PYTHON .. " $(1) s xavix $(<) $(2) $(@)" }},
+	}
+
+	dependency {
 		{ MAME_DIR .. "src/devices/cpu/m6502/xavix.cpp",    GEN_DIR .. "emu/cpu/m6502/xavix.hxx" },
+	}
+end
+
+if (CPUS["XAVIX2000"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/cpu/m6502/xavix2000.cpp",
+		MAME_DIR .. "src/devices/cpu/m6502/xavix2000.h",
+	}
+
+	custombuildtask {
+		{ MAME_DIR .. "src/devices/cpu/m6502/oxavix2000.lst",   GEN_DIR .. "emu/cpu/m6502/xavix2000.hxx",   { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dxavix2000.lst"   }, {"@echo Generating xavix2000 disassembler source file...", PYTHON .. " $(1) s xavix2000 $(<) $(2) $(@)" }},
+	}
+
+	dependency {
 		{ MAME_DIR .. "src/devices/cpu/m6502/xavix2000.cpp",    GEN_DIR .. "emu/cpu/m6502/xavix2000.hxx" },
 	}
 end
@@ -1619,8 +1652,6 @@ if (CPUS["M6502"]~=null or _OPTIONS["with-tools"]) then
 	table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/om740.lst" ,   GEN_DIR .. "emu/cpu/m6502/m740d.hxx",    { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dm740.lst"    }, {"@echo Generating m740 disassembler source file...", PYTHON .. " $(1) d m740 $(<) $(2) $(@)" }})
 	table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/dr65c02.lst",  GEN_DIR .. "emu/cpu/m6502/r65c02d.hxx",  { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",                                                     }, {"@echo Generating r65c02 disassembler source file...", PYTHON .. " $(1) d r65c02 - $(<) $(@)" }})
 	table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/or65c19.lst",  GEN_DIR .. "emu/cpu/m6502/r65c19d.hxx",  { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dr65c19.lst"  }, {"@echo Generating r65c19 disassembler source file...", PYTHON .. " $(1) d r65c19 $(<) $(2) $(@)" }})
-	table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/oxavix.lst",   GEN_DIR .. "emu/cpu/m6502/xavixd.hxx",   { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dxavix.lst"   }, {"@echo Generating xavix disassembler source file...", PYTHON .. " $(1) d xavix $(<) $(2) $(@)" }})
-	table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/oxavix2000.lst",   GEN_DIR .. "emu/cpu/m6502/xavix2000d.hxx",   { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dxavix2000.lst"   }, {"@echo Generating xavix2000 disassembler source file...", PYTHON .. " $(1) d xavix2000 $(<) $(2) $(@)" }})
 
 	table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/deco16d.cpp",   GEN_DIR .. "emu/cpu/m6502/deco16d.hxx" })
 	table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m4510d.cpp",    GEN_DIR .. "emu/cpu/m6502/m4510d.hxx" })
@@ -1633,8 +1664,6 @@ if (CPUS["M6502"]~=null or _OPTIONS["with-tools"]) then
 	table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/r65c02d.cpp",   GEN_DIR .. "emu/cpu/m6502/r65c02d.hxx" })
 	table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/r65c19d.cpp",   GEN_DIR .. "emu/cpu/m6502/r65c19d.hxx" })
 	table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m740d.cpp",     GEN_DIR .. "emu/cpu/m6502/m740d.hxx" })
-	table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/xavixd.cpp",    GEN_DIR .. "emu/cpu/m6502/xavixd.hxx" })
-	table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/xavix2000d.cpp",    GEN_DIR .. "emu/cpu/m6502/xavix2000d.hxx" })
 
 	table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/deco16d.cpp")
 	table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/deco16d.h")
@@ -1658,8 +1687,22 @@ if (CPUS["M6502"]~=null or _OPTIONS["with-tools"]) then
 	table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/r65c02d.h")
 	table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/r65c19d.cpp")
 	table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/r65c19d.h")
+end
+
+if (CPUS["XAVIX"]~=null or _OPTIONS["with-tools"]) then
+	table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/oxavix.lst",   GEN_DIR .. "emu/cpu/m6502/xavixd.hxx",   { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dxavix.lst"   }, {"@echo Generating xavix disassembler source file...", PYTHON .. " $(1) d xavix $(<) $(2) $(@)" }})
+
+	table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/xavixd.cpp",    GEN_DIR .. "emu/cpu/m6502/xavixd.hxx" })
+
 	table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/xavixd.cpp")
 	table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/xavixd.h")
+end
+
+if (CPUS["XAVIX2000"]~=null or _OPTIONS["with-tools"]) then
+	table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/oxavix2000.lst",   GEN_DIR .. "emu/cpu/m6502/xavix2000d.hxx",   { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py",   MAME_DIR  .. "src/devices/cpu/m6502/dxavix2000.lst"   }, {"@echo Generating xavix2000 disassembler source file...", PYTHON .. " $(1) d xavix2000 $(<) $(2) $(@)" }})
+
+	table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/xavix2000d.cpp",    GEN_DIR .. "emu/cpu/m6502/xavix2000d.hxx" })
+
 	table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/xavix2000d.cpp")
 	table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/xavix2000d.h")
 end
@@ -1818,25 +1861,19 @@ end
 
 --------------------------------------------------
 -- PDP-1
--- TX0
 --@src/devices/cpu/pdp1/pdp1.h,CPUS["PDP1"] = true
---@src/devices/cpu/pdp1/tx0.h,CPUS["PDP1"] = true
 --------------------------------------------------
 
 if (CPUS["PDP1"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/pdp1/pdp1.cpp",
 		MAME_DIR .. "src/devices/cpu/pdp1/pdp1.h",
-		MAME_DIR .. "src/devices/cpu/pdp1/tx0.cpp",
-		MAME_DIR .. "src/devices/cpu/pdp1/tx0.h",
 	}
 end
 
 if (CPUS["PDP1"]~=null or _OPTIONS["with-tools"]) then
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pdp1/pdp1dasm.cpp")
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pdp1/pdp1dasm.h")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pdp1/tx0dasm.cpp")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pdp1/tx0dasm.h")
 end
 
 --------------------------------------------------
@@ -2614,11 +2651,32 @@ if (CPUS["TLCS900"]~=null or _OPTIONS["with-tools"]) then
 end
 
 --------------------------------------------------
--- Zilog Z80
---@src/devices/cpu/z80/z80.h,CPUS["Z80"] = true
+-- TX0
+--@src/devices/cpu/tx0/tx0.h,CPUS["TX0"] = true
 --------------------------------------------------
 
-if (CPUS["Z80"]~=null) then
+if (CPUS["TX0"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/cpu/tx0/tx0.cpp",
+		MAME_DIR .. "src/devices/cpu/tx0/tx0.h",
+	}
+end
+
+if (CPUS["TX0"]~=null or _OPTIONS["with-tools"]) then
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tx0/tx0dasm.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tx0/tx0dasm.h")
+end
+
+--------------------------------------------------
+-- Zilog Z80
+--@src/devices/cpu/z80/z80.h,CPUS["Z80"] = true
+--@src/devices/cpu/z80/kc82.h,CPUS["KC80"] = true
+--@src/devices/cpu/z80/kl5c80a12.h,CPUS["KC80"] = true
+--@src/devices/cpu/z80/kl5c80a16.h,CPUS["KC80"] = true
+--@src/devices/cpu/z80/ky80.h,CPUS["KC80"] = true
+--------------------------------------------------
+
+if (CPUS["Z80"]~=null or CPUS["KC80"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/cpu/z80/z80.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/z80.h",
@@ -2626,6 +2684,13 @@ if (CPUS["Z80"]~=null) then
 		MAME_DIR .. "src/devices/cpu/z80/tmpz84c011.h",
 		MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.h",
+		MAME_DIR .. "src/devices/cpu/z80/lz8420m.cpp",
+		MAME_DIR .. "src/devices/cpu/z80/lz8420m.h",
+	}
+end
+
+if (CPUS["KC80"]~=null) then
+	files {
 		MAME_DIR .. "src/devices/cpu/z80/kc82.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/kc82.h",
 		MAME_DIR .. "src/devices/cpu/z80/kl5c80a12.cpp",
@@ -2638,12 +2703,10 @@ if (CPUS["Z80"]~=null) then
 		MAME_DIR .. "src/devices/cpu/z80/kp69.h",
 		MAME_DIR .. "src/devices/cpu/z80/ky80.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/ky80.h",
-		MAME_DIR .. "src/devices/cpu/z80/lz8420m.cpp",
-		MAME_DIR .. "src/devices/cpu/z80/lz8420m.h",
 	}
 end
 
-if (CPUS["Z80"]~=null or _OPTIONS["with-tools"]) then
+if (CPUS["Z80"]~=null or CPUS["KC80"]~=null or _OPTIONS["with-tools"]) then
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/z80dasm.cpp")
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/z80dasm.h")
 end
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 83926139079..9e328815a64 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -14,10 +14,14 @@
 ---------------------------------------------------
 
 CPUS["Z80"] = true
+CPUS["KC80"] = true
 CPUS["Z180"] = true
 CPUS["I8085"] = true
 CPUS["I8089"] = true
 CPUS["M6502"] = true
+--CPUS["ST2XXX"] = true
+--CPUS["XAVIX"] = true
+--CPUS["XAVIX2000"] = true
 CPUS["H6280"] = true
 CPUS["I86"] = true
 CPUS["I386"] = true
@@ -93,7 +97,8 @@ CPUS["APEXC"] = true
 CPUS["CP1610"] = true
 CPUS["F8"] = true
 CPUS["LH5801"] = true
-CPUS["PDP1"] = true
+--CPUS["PDP1"] = true
+--CPUS["TX0"] = true
 CPUS["SATURN"] = true
 CPUS["SC61860"] = true
 CPUS["LR35902"] = true
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index cd9d52ccaf7..ce71327381b 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -14,10 +14,14 @@
 --------------------------------------------------
 
 CPUS["Z80"] = true
+--CPUS["KC80"] = true
 CPUS["Z180"] = true
 CPUS["I8085"] = true
 CPUS["I8089"] = true
 CPUS["M6502"] = true
+CPUS["ST2XXX"] = true
+CPUS["XAVIX"] = true
+CPUS["XAVIX2000"] = true
 CPUS["H6280"] = true
 CPUS["I86"] = true
 CPUS["I386"] = true
@@ -95,6 +99,7 @@ CPUS["F8"] = true
 CPUS["LH5801"] = true
 CPUS["PATINHOFEIO"] = true
 CPUS["PDP1"] = true
+CPUS["TX0"] = true
 CPUS["SATURN"] = true
 CPUS["SC61860"] = true
 CPUS["LR35902"] = true
diff --git a/src/devices/cpu/pdp1/tx0.cpp b/src/devices/cpu/tx0/tx0.cpp
similarity index 100%
rename from src/devices/cpu/pdp1/tx0.cpp
rename to src/devices/cpu/tx0/tx0.cpp
diff --git a/src/devices/cpu/pdp1/tx0.h b/src/devices/cpu/tx0/tx0.h
similarity index 98%
rename from src/devices/cpu/pdp1/tx0.h
rename to src/devices/cpu/tx0/tx0.h
index e2d2cd86229..51c729bd743 100644
--- a/src/devices/cpu/pdp1/tx0.h
+++ b/src/devices/cpu/tx0/tx0.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Raphael Nabet
-#ifndef MAME_CPU_PDP1_TX0_H
-#define MAME_CPU_PDP1_TX0_H
+#ifndef MAME_CPU_TX0_TX0_H
+#define MAME_CPU_TX0_TX0_H
 
 #pragma once
 
@@ -159,4 +159,4 @@ private:
 DECLARE_DEVICE_TYPE(TX0_64KW, tx0_64kw_device)
 DECLARE_DEVICE_TYPE(TX0_8KW,  tx0_8kw_device)
 
-#endif // MAME_CPU_PDP1_TX0_H
+#endif // MAME_CPU_TX0_TX0_H
diff --git a/src/devices/cpu/pdp1/tx0dasm.cpp b/src/devices/cpu/tx0/tx0dasm.cpp
similarity index 100%
rename from src/devices/cpu/pdp1/tx0dasm.cpp
rename to src/devices/cpu/tx0/tx0dasm.cpp
diff --git a/src/devices/cpu/pdp1/tx0dasm.h b/src/devices/cpu/tx0/tx0dasm.h
similarity index 92%
rename from src/devices/cpu/pdp1/tx0dasm.h
rename to src/devices/cpu/tx0/tx0dasm.h
index ae97e2bcc1d..ff9b82e3a5e 100644
--- a/src/devices/cpu/pdp1/tx0dasm.h
+++ b/src/devices/cpu/tx0/tx0dasm.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Raphael Nabet
 
-#ifndef MAME_CPU_PDP1_TX0DASM_H
-#define MAME_CPU_PDP1_TX0DASM_H
+#ifndef MAME_CPU_TX0_TX0DASM_H
+#define MAME_CPU_TX0_TX0DASM_H
 
 #pragma once
 
diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp
index 51b11d3b0ee..8a8d5a21973 100644
--- a/src/mame/drivers/tx0.cpp
+++ b/src/mame/drivers/tx0.cpp
@@ -9,7 +9,6 @@
 #include "emu.h"
 #include "includes/tx0.h"
 
-#include "cpu/pdp1/tx0.h"
 #include "video/crt.h"
 #include "screen.h"
 
diff --git a/src/mame/includes/tx0.h b/src/mame/includes/tx0.h
index 7c2e1c066d1..37eb320b803 100644
--- a/src/mame/includes/tx0.h
+++ b/src/mame/includes/tx0.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "video/crt.h"
-#include "cpu/pdp1/tx0.h"
+#include "cpu/tx0/tx0.h"
 #include "emupal.h"
 
 enum state_t
diff --git a/src/mame/video/tx0.cpp b/src/mame/video/tx0.cpp
index a797864d4a0..619697226bf 100644
--- a/src/mame/video/tx0.cpp
+++ b/src/mame/video/tx0.cpp
@@ -8,7 +8,6 @@
 
 #include "emu.h"
 
-#include "cpu/pdp1/tx0.h"
 #include "includes/tx0.h"
 #include "video/crt.h"
 
diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp
index fd32fdf0932..0876cc84894 100644
--- a/src/tools/unidasm.cpp
+++ b/src/tools/unidasm.cpp
@@ -119,7 +119,6 @@ using util::BIT;
 #include "cpu/pace/pacedasm.h"
 #include "cpu/patinhofeio/patinho_feio_dasm.h"
 #include "cpu/pdp1/pdp1dasm.h"
-#include "cpu/pdp1/tx0dasm.h"
 #include "cpu/pdp8/pdp8dasm.h"
 #include "cpu/pic16/pic16d.h"
 #include "cpu/pic1670/pic1670d.h"
@@ -166,6 +165,7 @@ using util::BIT;
 #include "cpu/tms7000/7000dasm.h"
 #include "cpu/tms9900/9900dasm.h"
 #include "cpu/tms9900/tms99com.h"
+#include "cpu/tx0/tx0dasm.h"
 #include "cpu/ucom4/ucom4d.h"
 #include "cpu/unsp/unspdasm.h"
 #include "cpu/upd177x/upd177xd.h"