diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 3ba68547c83..71e446ec7ca 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -1864,30 +1864,6 @@ if (MACHINES["K056230"]~=null) then
 	}
 end
 
----------------------------------------------------
---
---@src/devices/machine/m950x0.h,MACHINES["M950X0"] = true
----------------------------------------------------
-
-if (MACHINES["M950X0"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/machine/m950x0.cpp",
-		MAME_DIR .. "src/devices/machine/m950x0.h",
-	}
-end
-
----------------------------------------------------
---
---@src/devices/machine/mm5740.h,MACHINES["MM5740"] = true
----------------------------------------------------
-
-if (MACHINES["MM5740"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/machine/mm5740.cpp",
-		MAME_DIR .. "src/devices/machine/mm5740.h",
-	}
-end
-
 ---------------------------------------------------
 --
 --@src/devices/machine/kb3600.h,MACHINES["KB3600"] = true
@@ -1900,6 +1876,18 @@ if (MACHINES["KB3600"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/machine/kr1601rr1.h,MACHINES["KR1601RR1"] = true
+---------------------------------------------------
+
+if (MACHINES["KR1601RR1"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/kr1601rr1.cpp",
+		MAME_DIR .. "src/devices/machine/kr1601rr1.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/machine/kr2376.h,MACHINES["KR2376"] = true
@@ -2094,6 +2082,18 @@ if (MACHINES["M6M80011AP"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/machine/m950x0.h,MACHINES["M950X0"] = true
+---------------------------------------------------
+
+if (MACHINES["M950X0"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/m950x0.cpp",
+		MAME_DIR .. "src/devices/machine/m950x0.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/machine/mb14241.h,MACHINES["MB14241"] = true
@@ -2410,6 +2410,18 @@ if (MACHINES["MM5307"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/machine/mm5740.h,MACHINES["MM5740"] = true
+---------------------------------------------------
+
+if (MACHINES["MM5740"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/mm5740.cpp",
+		MAME_DIR .. "src/devices/machine/mm5740.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/machine/mm58274c.h,MACHINES["MM58274C"] = true
diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua
index 8267e8cd6fe..f104b046e78 100644
--- a/scripts/target/mame/mame.lua
+++ b/scripts/target/mame/mame.lua
@@ -630,6 +630,7 @@ MACHINES["K054321"] = true
 MACHINES["K056230"] = true
 MACHINES["KB3600"] = true
 MACHINES["KBDC8042"] = true
+MACHINES["KR1601RR1"] = true
 MACHINES["KR2376"] = true
 MACHINES["LATCH8"] = true
 MACHINES["LC89510"] = true
diff --git a/src/mame/elektronika/kr1601rr1.cpp b/src/devices/machine/kr1601rr1.cpp
similarity index 100%
rename from src/mame/elektronika/kr1601rr1.cpp
rename to src/devices/machine/kr1601rr1.cpp
diff --git a/src/mame/elektronika/kr1601rr1.h b/src/devices/machine/kr1601rr1.h
similarity index 100%
rename from src/mame/elektronika/kr1601rr1.h
rename to src/devices/machine/kr1601rr1.h
diff --git a/src/mame/cccp/README.md b/src/mame/cccp/README.md
index 3dde1aaf1ac..601fe7f32d5 100644
--- a/src/mame/cccp/README.md
+++ b/src/mame/cccp/README.md
@@ -1,4 +1,5 @@
 # **src/mame/cccp** #
 
 СССР - Сою́з Сове́тских Социалисти́ческих Респу́блик (USSR)
+
 Driver files for hardware made in the Soviet Union. With some overlap for newer ones that are still on typical Soviet-era hardware.
\ No newline at end of file
diff --git a/src/mame/ddr/README.md b/src/mame/ddr/README.md
index 178890ca6ef..4005ab59d41 100644
--- a/src/mame/ddr/README.md
+++ b/src/mame/ddr/README.md
@@ -1,4 +1,5 @@
 # **src/mame/ddr** #
 
 DDR - Deutsche Demokratische Republik
+
 Driver files for hardware made in East Germany, before the German unification.
\ No newline at end of file
diff --git a/src/mame/elektronika/ms6102.cpp b/src/mame/elektronika/ms6102.cpp
index 5d51f1dea0c..246e0b84416 100644
--- a/src/mame/elektronika/ms6102.cpp
+++ b/src/mame/elektronika/ms6102.cpp
@@ -31,7 +31,6 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "kr1601rr1.h"
 
 #include "vt100_kbd.h"
 
@@ -42,6 +41,7 @@
 #include "machine/i8214.h"
 #include "machine/i8251.h"
 #include "machine/i8257.h"
+#include "machine/kr1601rr1.h"
 #include "machine/pit8253.h"
 #include "machine/ripple_counter.h"
 #include "video/i8275.h"