diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 5bb67032378..ea84fe73138 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -3049,8 +3049,8 @@ files {
 	MAME_DIR .. "src/mame/video/blockade.cpp",
 	MAME_DIR .. "src/mame/drivers/calorie.cpp",
 	MAME_DIR .. "src/mame/drivers/chihiro.cpp",
-	MAME_DIR .. "src/mame/includes/chihiro.h",
-	MAME_DIR .. "src/mame/video/chihiro.cpp",
+	MAME_DIR .. "src/mame/includes/xbox_nv2a.h",
+	MAME_DIR .. "src/mame/video/xbox_nv2a.cpp",
 	MAME_DIR .. "src/mame/drivers/coolridr.cpp",
 	MAME_DIR .. "src/mame/drivers/deniam.cpp",
 	MAME_DIR .. "src/mame/includes/deniam.h",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 262af489e2a..b2fa12977c0 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -1229,7 +1229,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/cps1.cpp",
 	MAME_DIR .. "src/mame/includes/cps1.h",
 	MAME_DIR .. "src/mame/video/cps1.cpp",
-	MAME_DIR .. "src/mame/video/chihiro.cpp",
+	MAME_DIR .. "src/mame/video/xbox_nv2a.cpp",
 	MAME_DIR .. "src/mame/machine/xbox.cpp",
 	MAME_DIR .. "src/mame/machine/xbox_usb.cpp",
 	MAME_DIR .. "src/mame/includes/saturn.h",
diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp
index 4e06ebb2dff..796d0c929c1 100644
--- a/src/mame/drivers/chihiro.cpp
+++ b/src/mame/drivers/chihiro.cpp
@@ -385,7 +385,7 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info.
 #include "debug/debugcon.h"
 #include "debug/debugcmd.h"
 #include "debugger.h"
-#include "includes/chihiro.h"
+#include "includes/xbox_nv2a.h"
 #include "includes/xbox.h"
 #include "includes/xbox_usb.h"
 #include "machine/jvshost.h"
diff --git a/src/mame/drivers/xbox.cpp b/src/mame/drivers/xbox.cpp
index f6a9c60f0d7..c187622a3a7 100644
--- a/src/mame/drivers/xbox.cpp
+++ b/src/mame/drivers/xbox.cpp
@@ -22,7 +22,7 @@
 #include "debug/debugcon.h"
 #include "debug/debugcmd.h"
 #include "debugger.h"
-#include "includes/chihiro.h"
+#include "includes/xbox_nv2a.h"
 #include "includes/xbox.h"
 #include "includes/xbox_usb.h"
 
diff --git a/src/mame/includes/chihiro.h b/src/mame/includes/xbox_nv2a.h
similarity index 100%
rename from src/mame/includes/chihiro.h
rename to src/mame/includes/xbox_nv2a.h
diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp
index b65c2512392..7e3ddf3ae63 100644
--- a/src/mame/machine/xbox.cpp
+++ b/src/mame/machine/xbox.cpp
@@ -14,7 +14,7 @@
 #include "debugger.h"
 #include "debug/debugcon.h"
 #include "debug/debugcmd.h"
-#include "includes/chihiro.h"
+#include "includes/xbox_nv2a.h"
 #include "includes/xbox.h"
 #include "includes/xbox_usb.h"
 
diff --git a/src/mame/machine/xbox_usb.cpp b/src/mame/machine/xbox_usb.cpp
index a8388467930..96d18b1f5bb 100644
--- a/src/mame/machine/xbox_usb.cpp
+++ b/src/mame/machine/xbox_usb.cpp
@@ -6,7 +6,7 @@
 #include "machine/idectrl.h"
 #include "video/poly.h"
 #include "bitmap.h"
-#include "includes/chihiro.h"
+#include "includes/xbox_nv2a.h"
 #include "includes/xbox.h"
 #include "includes/xbox_usb.h"
 
diff --git a/src/mame/video/chihiro.cpp b/src/mame/video/xbox_nv2a.cpp
similarity index 99%
rename from src/mame/video/chihiro.cpp
rename to src/mame/video/xbox_nv2a.cpp
index fbd0a4c72d4..bd761a8259e 100644
--- a/src/mame/video/chihiro.cpp
+++ b/src/mame/video/xbox_nv2a.cpp
@@ -4,7 +4,7 @@
 #include "video/poly.h"
 #include "bitmap.h"
 #include "machine/pic8259.h"
-#include "includes/chihiro.h"
+#include "includes/xbox_nv2a.h"
 
 //#define LOG_NV2A
 
@@ -2653,7 +2653,6 @@ uint32_t nv2a_renderer::render_triangle_culling(const rectangle &cliprect, rende
 
 uint32_t nv2a_renderer::render_triangle_clipping(const rectangle &cliprect, render_delegate callback, int paramcount, nv2avertex_t &_v1, nv2avertex_t &_v2, nv2avertex_t &_v3)
 {
-#if 1
 	nv2avertex_t *vi[3];
 	nv2avertex_t vo[16];
 	int idx_prev, idx_curr;
@@ -2661,11 +2660,9 @@ uint32_t nv2a_renderer::render_triangle_clipping(const rectangle &cliprect, rend
 	double tfactor;
 	int idx;
 	const double wthreshold = 0.00000001;
-#endif
 
 	if ((_v1.w > 0) && (_v2.w > 0) && (_v3.w > 0))
 		return render_triangle_culling(cliprect, callback, paramcount, _v1, _v2, _v3);
-#if 1
 	// assign the elements of the array
 	vi[0] = &_v1;
 	vi[1] = &_v2;
@@ -2763,7 +2760,6 @@ uint32_t nv2a_renderer::render_triangle_clipping(const rectangle &cliprect, rend
 		else
 			render_triangle_culling(cliprect, callback, paramcount, vo[n], vo[n + 2], vo[n + 1]);
 	}
-#endif
 	return 0;
 }