diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt
index b8da2a6ecc..88589615f9 100644
--- a/plugins/zzogl-pg/opengl/CMakeLists.txt
+++ b/plugins/zzogl-pg/opengl/CMakeLists.txt
@@ -46,7 +46,6 @@ endif(CMAKE_BUILD_TYPE STREQUAL Release)
 
 # zzogl sources
 set(zzoglSources
-    Clut.cpp
     GifTransfer.cpp
     GLWin32.cpp
     GLWinX11.cpp
@@ -64,6 +63,10 @@ set(zzoglSources
     x86.cpp
     zerogs.cpp
     zpipe.cpp
+    ZZClut.cpp
+    ZZKeyboard.cpp
+    ZZKick.cpp
+    ZZLog.cpp
     ZZoglCreate.cpp
     ZZoglCRTC.cpp
     ZZoglFlush.cpp
@@ -72,13 +75,10 @@ set(zzoglSources
     ZZoglShaders.cpp
     ZZoglShoots.cpp
     ZZoglVB.cpp
-    ZZKeyboard.cpp
-    ZZKick.cpp
-    ZZLog.cpp)
+    )
 
 # zzogl headers
 set(zzoglHeaders
-    Clut.h
     common.h
     CRC.h
     GifTransfer.h
@@ -97,13 +97,15 @@ set(zzoglHeaders
     x86.h
     zerogs.h
     zpipe.h
-    ZZoglCRTC.h
+    ZZClut.h
+    ZZGl.h
     ZZKick.h
+    ZZLog.h
+    ZZoglCRTC.h
     ZZoglMath.h
     ZZoglShaders.h
     ZZoglShoots.h
-    ZZGl.h
-    ZZLog.h)
+    )
 
 # zzogl S sources
 set(zzoglSSources
diff --git a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
index 9182c5ac47..52beed068f 100644
--- a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
+++ b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
@@ -98,8 +98,8 @@
 			<Mode after="always" />
 		</ExtraCommands>
 		<Unit filename="../../CRC.h" />
-		<Unit filename="../../Clut.cpp" />
-		<Unit filename="../../Clut.h" />
+		<Unit filename="../../ZZClut.cpp" />
+		<Unit filename="../../ZZClut.h" />
 		<Unit filename="../../GLWin.h" />
 		<Unit filename="../../GLWin32.cpp" />
 		<Unit filename="../../GLWinX11.cpp" />
diff --git a/plugins/zzogl-pg/opengl/Clut.cpp b/plugins/zzogl-pg/opengl/ZZClut.cpp
similarity index 100%
rename from plugins/zzogl-pg/opengl/Clut.cpp
rename to plugins/zzogl-pg/opengl/ZZClut.cpp
diff --git a/plugins/zzogl-pg/opengl/Clut.h b/plugins/zzogl-pg/opengl/ZZClut.h
similarity index 100%
rename from plugins/zzogl-pg/opengl/Clut.h
rename to plugins/zzogl-pg/opengl/ZZClut.h