diff --git a/polymer/eduke32/source/android/etcpak/Math.hpp b/polymer/eduke32/source/android/etcpak/Math.hpp
index aea0ff2ae..b42605cf8 100644
--- a/polymer/eduke32/source/android/etcpak/Math.hpp
+++ b/polymer/eduke32/source/android/etcpak/Math.hpp
@@ -1,5 +1,5 @@
-#ifndef __DARKRL__MATH_HPP__
-#define __DARKRL__MATH_HPP__
+#ifndef DARKRL__MATH_HPP__
+#define DARKRL__MATH_HPP__
 
 #include <algorithm>
 
diff --git a/polymer/eduke32/source/android/etcpak/ProcessCommon.hpp b/polymer/eduke32/source/android/etcpak/ProcessCommon.hpp
index 7e6addbcd..da2c43ecf 100644
--- a/polymer/eduke32/source/android/etcpak/ProcessCommon.hpp
+++ b/polymer/eduke32/source/android/etcpak/ProcessCommon.hpp
@@ -1,5 +1,5 @@
-#ifndef __PROCESSCOMMON_HPP__
-#define __PROCESSCOMMON_HPP__
+#ifndef PROCESSCOMMON_HPP__
+#define PROCESSCOMMON_HPP__
 
 #include <assert.h>
 #include <stddef.h>
diff --git a/polymer/eduke32/source/android/etcpak/ProcessRGB.hpp b/polymer/eduke32/source/android/etcpak/ProcessRGB.hpp
index 21434a3b2..a81b29286 100644
--- a/polymer/eduke32/source/android/etcpak/ProcessRGB.hpp
+++ b/polymer/eduke32/source/android/etcpak/ProcessRGB.hpp
@@ -1,5 +1,5 @@
-#ifndef __PROCESSRGB_HPP__
-#define __PROCESSRGB_HPP__
+#ifndef PROCESSRGB_HPP__
+#define PROCESSRGB_HPP__
 
 #include "Types.hpp"
 
diff --git a/polymer/eduke32/source/android/etcpak/Tables.hpp b/polymer/eduke32/source/android/etcpak/Tables.hpp
index 89d1acef3..46f5a36da 100644
--- a/polymer/eduke32/source/android/etcpak/Tables.hpp
+++ b/polymer/eduke32/source/android/etcpak/Tables.hpp
@@ -1,5 +1,5 @@
-#ifndef __TABLES_HPP__
-#define __TABLES_HPP__
+#ifndef TABLES_HPP__
+#define TABLES_HPP__
 
 #include "Types.hpp"
 
diff --git a/polymer/eduke32/source/android/etcpak/Types.hpp b/polymer/eduke32/source/android/etcpak/Types.hpp
index 0d8feddc6..06709dee1 100644
--- a/polymer/eduke32/source/android/etcpak/Types.hpp
+++ b/polymer/eduke32/source/android/etcpak/Types.hpp
@@ -1,5 +1,5 @@
-#ifndef __DARKRL__TYPES_HPP__
-#define __DARKRL__TYPES_HPP__
+#ifndef DARKRL__TYPES_HPP__
+#define DARKRL__TYPES_HPP__
 
 #include <cstdint>
 
diff --git a/polymer/eduke32/source/android/etcpak/Vector.hpp b/polymer/eduke32/source/android/etcpak/Vector.hpp
index 3005fdc53..97fb2470a 100644
--- a/polymer/eduke32/source/android/etcpak/Vector.hpp
+++ b/polymer/eduke32/source/android/etcpak/Vector.hpp
@@ -1,5 +1,5 @@
-#ifndef __DARKRL__VECTOR_HPP__
-#define __DARKRL__VECTOR_HPP__
+#ifndef DARKRL__VECTOR_HPP__
+#define DARKRL__VECTOR_HPP__
 
 #include <assert.h>
 #include <algorithm>