diff --git a/src/cocoa_joystick.h b/src/cocoa_joystick.h
index 9cb12e65..5a668c8c 100644
--- a/src/cocoa_joystick.h
+++ b/src/cocoa_joystick.h
@@ -24,9 +24,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_cocoa_joystick_h_
-#define _glfw3_cocoa_joystick_h_
-
 #include <IOKit/IOKitLib.h>
 #include <IOKit/IOCFPlugIn.h>
 #include <IOKit/hid/IOHIDLib.h>
@@ -50,4 +47,3 @@ typedef struct _GLFWjoystickNS
 void _glfwInitJoysticksNS(void);
 void _glfwTerminateJoysticksNS(void);
 
-#endif // _glfw3_cocoa_joystick_h_
diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h
index 74db7fa5..f744f78c 100644
--- a/src/cocoa_platform.h
+++ b/src/cocoa_platform.h
@@ -24,9 +24,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_cocoa_platform_h_
-#define _glfw3_cocoa_platform_h_
-
 #include <stdint.h>
 #include <dlfcn.h>
 
@@ -164,4 +161,3 @@ void _glfwPollMonitorsNS(void);
 GLFWbool _glfwSetVideoModeNS(_GLFWmonitor* monitor, const GLFWvidmode* desired);
 void _glfwRestoreVideoModeNS(_GLFWmonitor* monitor);
 
-#endif // _glfw3_cocoa_platform_h_
diff --git a/src/egl_context.h b/src/egl_context.h
index f8393a49..bfab5111 100644
--- a/src/egl_context.h
+++ b/src/egl_context.h
@@ -25,9 +25,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_egl_context_h_
-#define _glfw3_egl_context_h_
-
 #if defined(_GLFW_USE_EGLPLATFORM_H)
  #include <EGL/eglplatform.h>
 #elif defined(_GLFW_WIN32)
@@ -219,4 +216,3 @@ GLFWbool _glfwChooseVisualEGL(const _GLFWctxconfig* ctxconfig,
                               Visual** visual, int* depth);
 #endif /*_GLFW_X11*/
 
-#endif // _glfw3_egl_context_h_
diff --git a/src/glx_context.h b/src/glx_context.h
index 285861f9..3a427bd2 100644
--- a/src/glx_context.h
+++ b/src/glx_context.h
@@ -25,9 +25,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_glx_context_h_
-#define _glfw3_glx_context_h_
-
 #define GLX_VENDOR 1
 #define GLX_RGBA_BIT 0x00000001
 #define GLX_WINDOW_BIT 0x00000001
@@ -180,4 +177,3 @@ GLFWbool _glfwChooseVisualGLX(const _GLFWctxconfig* ctxconfig,
                               const _GLFWfbconfig* fbconfig,
                               Visual** visual, int* depth);
 
-#endif // _glfw3_glx_context_h_
diff --git a/src/internal.h b/src/internal.h
index c2b35813..bd4c5307 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -25,10 +25,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_internal_h_
-#define _glfw3_internal_h_
-
-
 #if defined(_GLFW_USE_CONFIG_H)
  #include "glfw_config.h"
 #endif
@@ -961,4 +957,3 @@ void _glfwTerminateVulkan(void);
  */
 const char* _glfwGetVulkanResultString(VkResult result);
 
-#endif // _glfw3_internal_h_
diff --git a/src/linux_joystick.h b/src/linux_joystick.h
index 3698b7e0..311becf6 100644
--- a/src/linux_joystick.h
+++ b/src/linux_joystick.h
@@ -24,9 +24,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_linux_joystick_h_
-#define _glfw3_linux_joystick_h_
-
 #include <regex.h>
 
 #define _GLFW_PLATFORM_JOYSTICK_STATE         _GLFWjoystickLinux linjs
@@ -55,4 +52,3 @@ GLFWbool _glfwInitJoysticksLinux(void);
 void _glfwTerminateJoysticksLinux(void);
 void _glfwDetectJoystickConnectionLinux(void);
 
-#endif // _glfw3_linux_joystick_h_
diff --git a/src/mir_platform.h b/src/mir_platform.h
index d3fd10de..3dac43ec 100644
--- a/src/mir_platform.h
+++ b/src/mir_platform.h
@@ -24,9 +24,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_mir_platform_h_
-#define _glfw3_mir_platform_h_
-
 #include <sys/queue.h>
 #include <pthread.h>
 #include <dlfcn.h>
@@ -134,4 +131,3 @@ extern void _glfwPollMonitorsMir(void);
 extern void _glfwInitEventQueueMir(EventQueue* queue);
 extern void _glfwDeleteEventQueueMir(EventQueue* queue);
 
-#endif // _glfw3_mir_platform_h_
diff --git a/src/nsgl_context.h b/src/nsgl_context.h
index 45847769..18042dee 100644
--- a/src/nsgl_context.h
+++ b/src/nsgl_context.h
@@ -24,9 +24,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_nsgl_context_h_
-#define _glfw3_nsgl_context_h_
-
 #define _GLFW_PLATFORM_CONTEXT_STATE            _GLFWcontextNSGL nsgl
 #define _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE    _GLFWlibraryNSGL nsgl
 
@@ -57,4 +54,3 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
                                 const _GLFWfbconfig* fbconfig);
 void _glfwDestroyContextNSGL(_GLFWwindow* window);
 
-#endif // _glfw3_nsgl_context_h_
diff --git a/src/null_joystick.h b/src/null_joystick.h
index 8d2e315a..3de73458 100644
--- a/src/null_joystick.h
+++ b/src/null_joystick.h
@@ -24,11 +24,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_null_joystick_h_
-#define _glfw3_null_joystick_h_
-
 #define _GLFW_PLATFORM_JOYSTICK_STATE         int nulljs
 #define _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE int nulljs
 
-
-#endif // _glfw3_null_joystick_h_
diff --git a/src/null_platform.h b/src/null_platform.h
index 3218610d..dfb88a16 100644
--- a/src/null_platform.h
+++ b/src/null_platform.h
@@ -25,9 +25,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_null_platform_h_
-#define _glfw3_null_platform_h_
-
 #include <dlfcn.h>
 
 #define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowNull null
@@ -63,5 +60,3 @@ typedef struct _GLFWwindowNull
     int height;
 } _GLFWwindowNull;
 
-
-#endif // _glfw3_null_platform_h_
diff --git a/src/osmesa_context.h b/src/osmesa_context.h
index 275546f1..e6ae5781 100644
--- a/src/osmesa_context.h
+++ b/src/osmesa_context.h
@@ -25,9 +25,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_osmesa_context_h_
-#define _glfw3_osmesa_context_h_
-
 #define OSMESA_RGBA 0x1908
 #define OSMESA_FORMAT 0x22
 #define OSMESA_DEPTH_BITS 0x30
@@ -95,4 +92,3 @@ GLFWbool _glfwCreateContextOSMesa(_GLFWwindow* window,
                                   const _GLFWctxconfig* ctxconfig,
                                   const _GLFWfbconfig* fbconfig);
 
-#endif // _glfw3_osmesa_context_h_
diff --git a/src/posix_time.h b/src/posix_time.h
index f4cf4db1..f1a69eb2 100644
--- a/src/posix_time.h
+++ b/src/posix_time.h
@@ -25,9 +25,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_posix_time_h_
-#define _glfw3_posix_time_h_
-
 #define _GLFW_PLATFORM_LIBRARY_TIMER_STATE _GLFWtimerPOSIX posix
 
 #include <stdint.h>
@@ -45,4 +42,3 @@ typedef struct _GLFWtimerPOSIX
 
 void _glfwInitTimerPOSIX(void);
 
-#endif // _glfw3_posix_time_h_
diff --git a/src/posix_tls.h b/src/posix_tls.h
index 5d0e7c36..f738dc0d 100644
--- a/src/posix_tls.h
+++ b/src/posix_tls.h
@@ -25,9 +25,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_posix_tls_h_
-#define _glfw3_posix_tls_h_
-
 #include <pthread.h>
 
 #define _GLFW_PLATFORM_TLS_STATE _GLFWtlsPOSIX posix
@@ -42,5 +39,3 @@ typedef struct _GLFWtlsPOSIX
 
 } _GLFWtlsPOSIX;
 
-
-#endif // _glfw3_posix_tls_h_
diff --git a/src/wgl_context.h b/src/wgl_context.h
index 3b7f0247..e02cc0ec 100644
--- a/src/wgl_context.h
+++ b/src/wgl_context.h
@@ -25,10 +25,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_wgl_context_h_
-#define _glfw3_wgl_context_h_
-
-
 #define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000
 #define WGL_SUPPORT_OPENGL_ARB 0x2010
 #define WGL_DRAW_TO_WINDOW_ARB 0x2001
@@ -157,4 +153,3 @@ GLFWbool _glfwCreateContextWGL(_GLFWwindow* window,
                                const _GLFWctxconfig* ctxconfig,
                                const _GLFWfbconfig* fbconfig);
 
-#endif // _glfw3_wgl_context_h_
diff --git a/src/win32_joystick.h b/src/win32_joystick.h
index 8070a425..54102e62 100644
--- a/src/win32_joystick.h
+++ b/src/win32_joystick.h
@@ -24,9 +24,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_win32_joystick_h_
-#define _glfw3_win32_joystick_h_
-
 #define _GLFW_PLATFORM_JOYSTICK_STATE         _GLFWjoystickWin32 win32
 #define _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE int dummy
 
@@ -56,4 +53,3 @@ void _glfwTerminateJoysticksWin32(void);
 void _glfwDetectJoystickConnectionWin32(void);
 void _glfwDetectJoystickDisconnectionWin32(void);
 
-#endif // _glfw3_win32_joystick_h_
diff --git a/src/win32_platform.h b/src/win32_platform.h
index d51dee25..3e0c93b0 100644
--- a/src/win32_platform.h
+++ b/src/win32_platform.h
@@ -25,9 +25,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_win32_platform_h_
-#define _glfw3_win32_platform_h_
-
 // We don't need all the fancy stuff
 #ifndef NOMINMAX
  #define NOMINMAX
@@ -351,4 +348,3 @@ void _glfwPollMonitorsWin32(void);
 GLFWbool _glfwSetVideoModeWin32(_GLFWmonitor* monitor, const GLFWvidmode* desired);
 void _glfwRestoreVideoModeWin32(_GLFWmonitor* monitor);
 
-#endif // _glfw3_win32_platform_h_
diff --git a/src/wl_platform.h b/src/wl_platform.h
index bea32350..62069857 100644
--- a/src/wl_platform.h
+++ b/src/wl_platform.h
@@ -24,9 +24,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_wayland_platform_h_
-#define _glfw3_wayland_platform_h_
-
 #include <wayland-client.h>
 #include <xkbcommon/xkbcommon.h>
 #include <xkbcommon/xkbcommon-compose.h>
@@ -169,4 +166,3 @@ typedef struct _GLFWcursorWayland
 
 void _glfwAddOutputWayland(uint32_t name, uint32_t version);
 
-#endif // _glfw3_wayland_platform_h_
diff --git a/src/x11_platform.h b/src/x11_platform.h
index 4d6c44fb..48ee88b1 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -25,9 +25,6 @@
 //
 //========================================================================
 
-#ifndef _glfw3_x11_platform_h_
-#define _glfw3_x11_platform_h_
-
 #include <unistd.h>
 #include <signal.h>
 #include <stdint.h>
@@ -335,4 +332,3 @@ void _glfwInputErrorX11(int error, const char* message);
 
 void _glfwPushSelectionToManagerX11(void);
 
-#endif // _glfw3_x11_platform_h_
diff --git a/src/xkb_unicode.h b/src/xkb_unicode.h
index 164a6fa8..f95e14f1 100644
--- a/src/xkb_unicode.h
+++ b/src/xkb_unicode.h
@@ -24,10 +24,5 @@
 //
 //========================================================================
 
-#ifndef _glfw3_xkb_unicode_h_
-#define _glfw3_xkb_unicode_h_
-
-
 long _glfwKeySym2Unicode(unsigned int keysym);
 
-#endif // _glfw3_xkb_unicode_h_