diff --git a/include/Makefile.am b/include/Makefile.am
index 0f31fc2d3..6893df266 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -21,6 +21,7 @@ libSDLinclude_HEADERS =		\
 	SDL_main.h		\
 	SDL_mouse.h		\
 	SDL_mutex.h		\
+	SDL_name.h		\
 	SDL_opengl.h		\
 	SDL_quit.h		\
 	SDL_rwops.h		\
diff --git a/src/video/Xext/extensions/SDLname.h b/include/SDL_name.h
similarity index 53%
rename from src/video/Xext/extensions/SDLname.h
rename to include/SDL_name.h
index 5105db7a9..483438120 100644
--- a/src/video/Xext/extensions/SDLname.h
+++ b/include/SDL_name.h
@@ -2,7 +2,12 @@
 #ifndef _SDLname_h_
 #define _SDLname_h_
 
+#if defined(__STDC__) || defined(__cplusplus)
 #define NeedFunctionPrototypes 1
-#define SDL_NAME(X)	SDL_##X
-
 #endif
+
+#ifndef SDL_NAME
+#define SDL_NAME(X)	SDL_##X
+#endif
+
+#endif /* _SDLname_h_ */
diff --git a/src/video/Xext/extensions/Xinerama.h b/src/video/Xext/extensions/Xinerama.h
index e749e0854..54f2fe17d 100644
--- a/src/video/Xext/extensions/Xinerama.h
+++ b/src/video/Xext/extensions/Xinerama.h
@@ -3,7 +3,7 @@
 #ifndef _Xinerama_h
 #define _Xinerama_h
 
-#include "SDLname.h"
+#include "SDL_name.h"
 
 typedef struct {
    int   screen_number;
diff --git a/src/video/Xext/extensions/Xvlib.h b/src/video/Xext/extensions/Xvlib.h
index 946622b30..2013e123a 100644
--- a/src/video/Xext/extensions/Xvlib.h
+++ b/src/video/Xext/extensions/Xvlib.h
@@ -55,7 +55,7 @@ SOFTWARE.
 
 #include <X11/Xfuncproto.h>
 #include <XFree86/extensions/Xv.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 typedef struct {
   int numerator;
diff --git a/src/video/Xext/extensions/panoramiXext.h b/src/video/Xext/extensions/panoramiXext.h
index c5cbf6ddf..e89d8917b 100644
--- a/src/video/Xext/extensions/panoramiXext.h
+++ b/src/video/Xext/extensions/panoramiXext.h
@@ -28,7 +28,7 @@ Equipment Corporation.
  */
 /* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */
 
-#include "SDLname.h"
+#include "SDL_name.h"
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
 
diff --git a/src/video/Xext/extensions/xf86dga.h b/src/video/Xext/extensions/xf86dga.h
index 440caa830..3c96703f1 100644
--- a/src/video/Xext/extensions/xf86dga.h
+++ b/src/video/Xext/extensions/xf86dga.h
@@ -8,7 +8,7 @@
 
 #include <X11/Xfuncproto.h>
 #include <XFree86/extensions/xf86dga1.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 #define X_XDGAQueryVersion		0
 
diff --git a/src/video/Xext/extensions/xf86dga1.h b/src/video/Xext/extensions/xf86dga1.h
index dfe1f9b3d..4a49e9f38 100644
--- a/src/video/Xext/extensions/xf86dga1.h
+++ b/src/video/Xext/extensions/xf86dga1.h
@@ -16,7 +16,7 @@ Copyright (c) 1995  XFree86 Inc
 #define _XF86DGA1_H_
 
 #include <X11/Xfuncproto.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 #define X_XF86DGAQueryVersion		0
 #define X_XF86DGAGetVideoLL		1
diff --git a/src/video/Xext/extensions/xf86vmode.h b/src/video/Xext/extensions/xf86vmode.h
index 2f77dc9b1..eb56c0e8d 100644
--- a/src/video/Xext/extensions/xf86vmode.h
+++ b/src/video/Xext/extensions/xf86vmode.h
@@ -37,7 +37,7 @@ from Kaleb S. KEITHLEY
 
 #include <X11/Xfuncproto.h>
 #include <X11/Xmd.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 #define X_XF86VidModeQueryVersion	0
 #define X_XF86VidModeGetModeLine	1