diff --git a/src/core/windows/SDL_windows.c b/src/core/windows/SDL_windows.c
index 82b10cf93..aff6e6d28 100644
--- a/src/core/windows/SDL_windows.c
+++ b/src/core/windows/SDL_windows.c
@@ -124,6 +124,6 @@ BOOL WIN_IsWindowsVistaOrGreater()
 #endif
 }
 
-#endif /* __WIN32__ */
+#endif /* __WIN32__ || __WINRT__ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/default_cursor.h b/src/events/default_cursor.h
index 352e9af5a..e292cbf5a 100644
--- a/src/events/default_cursor.h
+++ b/src/events/default_cursor.h
@@ -110,5 +110,5 @@ static const unsigned char default_cmask[] = {
     0x03, 0x00
 };
 
-#endif /* TRUE_MACINTOSH_CURSOR */
+#endif /* USE_MACOS_CURSOR */
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c
index b35fed73c..21c22bfd7 100644
--- a/src/render/opengles/SDL_render_gles.c
+++ b/src/render/opengles/SDL_render_gles.c
@@ -43,7 +43,7 @@ glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
     return;
 }
 
-#endif /* PANDORA */
+#endif /* SDL_VIDEO_DRIVER_PANDORA */
 
 /* OpenGL ES 1.1 renderer implementation, based on the OpenGL renderer */
 
@@ -206,7 +206,7 @@ static int GLES_LoadFunctions(GLES_RenderData * data)
     do { \
         data->func = SDL_GL_GetProcAddress(#func); \
     } while ( 0 );    
-#endif /* _SDL_NOGETPROCADDR_ */
+#endif /* __SDL_NOGETPROCADDR__ */
 
 #include "SDL_glesfuncs.h"
 #undef SDL_PROC
diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c
index c36539e95..1e539ae75 100644
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@@ -300,7 +300,7 @@ static int GLES2_LoadFunctions(GLES2_DriverContext * data)
             return SDL_SetError("Couldn't load GLES2 function %s: %s\n", #func, SDL_GetError()); \
         } \
     } while ( 0 );
-#endif /* _SDL_NOGETPROCADDR_ */
+#endif /* __SDL_NOGETPROCADDR__ */
 
 #include "SDL_gles2funcs.h"
 #undef SDL_PROC
diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c
index d46381d5b..4ba7c82cd 100644
--- a/src/video/SDL_blit_A.c
+++ b/src/video/SDL_blit_A.c
@@ -580,7 +580,7 @@ BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info)
     _mm_empty();
 }
 
-#endif /* __MMX__ */
+#endif /* __3dNOW__ */
 
 /* 16bpp special case for per-surface alpha=50%: blend 2 pixels in parallel */
 
diff --git a/src/video/emscripten/SDL_emscriptenframebuffer.h b/src/video/emscripten/SDL_emscriptenframebuffer.h
index bddbacd04..01ed37d1c 100644
--- a/src/video/emscripten/SDL_emscriptenframebuffer.h
+++ b/src/video/emscripten/SDL_emscriptenframebuffer.h
@@ -27,6 +27,6 @@ extern int Emscripten_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32
 extern int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects);
 extern void Emscripten_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
 
-#endif /* _SDL_emsctiptenframebuffer_h */
+#endif /* _SDL_emscriptenframebuffer_h */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_mirwindow.h b/src/video/mir/SDL_mirwindow.h
index cadd090eb..577dfa417 100644
--- a/src/video/mir/SDL_mirwindow.h
+++ b/src/video/mir/SDL_mirwindow.h
@@ -63,7 +63,7 @@ MIR_RestoreWindow(_THIS, SDL_Window* window);
 extern SDL_bool
 MIR_GetWindowWMInfo(_THIS, SDL_Window* window, SDL_SysWMinfo* info);
 
-#endif /* _SDL_mirwindow */
+#endif /* _SDL_mirwindow_h */
 
 /* vi: set ts=4 sw=4 expandtab: */
 
diff --git a/src/video/uikit/keyinfotable.h b/src/video/uikit/keyinfotable.h
index 8f3313a42..22a79dceb 100644
--- a/src/video/uikit/keyinfotable.h
+++ b/src/video/uikit/keyinfotable.h
@@ -169,6 +169,6 @@ static UIKitKeyInfo unicharToUIKeyInfoTable[] = {
 /*  127 */{    SDL_SCANCODE_BACKSPACE, KMOD_SHIFT }
 };
 
-#endif /* UIKitKeyInfo */
+#endif /* _UIKIT_KeyInfo */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtmouse_c.h b/src/video/winrt/SDL_winrtmouse_c.h
index ab88e2808..f97af04d2 100644
--- a/src/video/winrt/SDL_winrtmouse_c.h
+++ b/src/video/winrt/SDL_winrtmouse_c.h
@@ -35,6 +35,6 @@ extern SDL_bool WINRT_UsingRelativeMouseMode;
 }
 #endif
 
-#endif /* _SDL_windowsmouse_h */
+#endif /* _SDL_winrtmouse_h */
 
 /* vi: set ts=4 sw=4 expandtab: */