diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index bc46898d..3bf563c7 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -27,8 +27,8 @@
  *
  *************************************************************************/
 
-#ifndef __glfw3_h__
-#define __glfw3_h__
+#ifndef _glfw3_h_
+#define _glfw3_h_
 
 #ifdef __cplusplus
 extern "C" {
@@ -1815,5 +1815,5 @@ GLFWAPI GLFWglproc glfwGetProcAddress(const char* procname);
 }
 #endif
 
-#endif /* __glfw3_h__ */
+#endif /* _glfw3_h_ */
 
diff --git a/include/GL/glfw3native.h b/include/GL/glfw3native.h
index 95d54eaf..1dd4fbff 100644
--- a/include/GL/glfw3native.h
+++ b/include/GL/glfw3native.h
@@ -27,8 +27,8 @@
  *
  *************************************************************************/
 
-#ifndef __glfw3_platform_h__
-#define __glfw3_platform_h__
+#ifndef _glfw3_native_h_
+#define _glfw3_native_h_
 
 #ifdef __cplusplus
 extern "C" {
@@ -136,5 +136,5 @@ GLFWAPI GLXContext glfwGetGLXContext(GLFWwindow window);
 }
 #endif
 
-#endif /* __glfw3_platform_h__ */
+#endif /* _glfw3_native_h_ */
 
diff --git a/src/glx_platform.h b/src/glx_platform.h
index dc0b3632..8cd9f229 100644
--- a/src/glx_platform.h
+++ b/src/glx_platform.h
@@ -28,8 +28,8 @@
 //
 //========================================================================
 
-#ifndef _x11_glx_platform_h_
-#define _x11_glx_platform_h_
+#ifndef _glx_platform_h_
+#define _glx_platform_h_
 
 #define GLX_GLXEXT_LEGACY
 #include <GL/glx.h>
@@ -119,4 +119,4 @@ typedef struct _GLFWlibraryGLX
 } _GLFWlibraryGLX;
 
 
-#endif // _x11_glx_platform_h_
+#endif // _glx_platform_h_
diff --git a/src/x11_platform.h b/src/x11_platform.h
index 6e660eb7..abe45813 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -28,8 +28,8 @@
 //
 //========================================================================
 
-#ifndef _platform_h_
-#define _platform_h_
+#ifndef _x11_platform_h_
+#define _x11_platform_h_
 
 #include <unistd.h>
 #include <signal.h>
@@ -251,4 +251,4 @@ Atom _glfwWriteSelection(XSelectionRequestEvent* request);
 // Event processing
 void _glfwProcessPendingEvents(void);
 
-#endif // _platform_h_
+#endif // _x11_platform_h_