From ccc39b286d2d8a626697a478d944a42cf174398b Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Wed, 16 Feb 2011 15:46:12 -0800
Subject: [PATCH] Renamed SDL_keysym.h to SDL_keycode.h to avoid confusion.

---
 VisualC/SDL/SDL_VS2008.vcproj                          |  2 +-
 VisualC/SDL/SDL_VS2010.vcxproj                         |  2 +-
 VisualCE/SDL/SDL.vcproj                                |  2 +-
 .../SDL/SDLiPhoneOS.xcodeproj/project.pbxproj          |  8 ++++----
 Xcode/SDL/SDL.xcodeproj/project.pbxproj                | 10 ++++++----
 include/SDL_keyboard.h                                 |  2 +-
 include/{SDL_keysym.h => SDL_keycode.h}                |  8 ++++----
 src/events/SDL_keyboard_c.h                            |  2 +-
 src/video/cocoa/SDL_cocoavideo.h                       |  2 +-
 src/video/x11/SDL_x11video.h                           |  2 +-
 10 files changed, 21 insertions(+), 19 deletions(-)
 rename include/{SDL_keysym.h => SDL_keycode.h} (99%)

diff --git a/VisualC/SDL/SDL_VS2008.vcproj b/VisualC/SDL/SDL_VS2008.vcproj
index 1ce669c95..c450d7395 100644
--- a/VisualC/SDL/SDL_VS2008.vcproj
+++ b/VisualC/SDL/SDL_VS2008.vcproj
@@ -448,7 +448,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_keysym.h"
+				RelativePath="..\..\include\SDL_keycode.h"
 				>
 			</File>
 			<File
diff --git a/VisualC/SDL/SDL_VS2010.vcxproj b/VisualC/SDL/SDL_VS2010.vcxproj
index 06fd51503..2f2b4aa19 100644
--- a/VisualC/SDL/SDL_VS2010.vcxproj
+++ b/VisualC/SDL/SDL_VS2010.vcxproj
@@ -227,7 +227,7 @@
     <ClInclude Include="..\..\include\SDL_input.h" />
     <ClInclude Include="..\..\include\SDL_joystick.h" />
     <ClInclude Include="..\..\include\SDL_keyboard.h" />
-    <ClInclude Include="..\..\include\SDL_keysym.h" />
+    <ClInclude Include="..\..\include\SDL_keycode.h" />
     <ClInclude Include="..\..\include\SDL_loadso.h" />
     <ClInclude Include="..\..\include\SDL_log.h" />
     <ClInclude Include="..\..\include\SDL_main.h" />
diff --git a/VisualCE/SDL/SDL.vcproj b/VisualCE/SDL/SDL.vcproj
index f11945845..de2df60ab 100644
--- a/VisualCE/SDL/SDL.vcproj
+++ b/VisualCE/SDL/SDL.vcproj
@@ -1255,7 +1255,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_keysym.h"
+				RelativePath="..\..\include\SDL_keycode.h"
 				>
 			</File>
 			<File
diff --git a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
index 4060d911a..a3253cb77 100755
--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
@@ -64,6 +64,7 @@
 		0402A85912FE70C600CECEE3 /* SDL_shaders_gles2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0402A85612FE70C600CECEE3 /* SDL_shaders_gles2.c */; };
 		0402A85A12FE70C600CECEE3 /* SDL_shaders_gles2.h in Headers */ = {isa = PBXBuildFile; fileRef = 0402A85712FE70C600CECEE3 /* SDL_shaders_gles2.h */; };
 		04043B8D12FEA9350076DB1F /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = 04043B8C12FEA9350076DB1F /* SDL_opengles2.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0417A516130C988500578583 /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0417A515130C988500578583 /* SDL_keycode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		041B2CD912FA0E9E0087D585 /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2CD812FA0E9E0087D585 /* SDL_render.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		041B2CF112FA0F680087D585 /* SDL_render.c in Sources */ = {isa = PBXBuildFile; fileRef = 041B2CEA12FA0F680087D585 /* SDL_render.c */; };
 		041B2CF212FA0F680087D585 /* SDL_sysrender.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2CEB12FA0F680087D585 /* SDL_sysrender.h */; };
@@ -134,7 +135,6 @@
 		FD3F496C0DEA5B2100C5B771 /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8DD0DD52EB400FB1D6B /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FD3F496D0DEA5B2100C5B771 /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8DE0DD52EB400FB1D6B /* SDL_joystick.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FD3F496E0DEA5B2100C5B771 /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8DF0DD52EB400FB1D6B /* SDL_keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		FD3F496F0DEA5B2100C5B771 /* SDL_keysym.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8E00DD52EB400FB1D6B /* SDL_keysym.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FD3F49700DEA5B2100C5B771 /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8E10DD52EB400FB1D6B /* SDL_loadso.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FD3F49710DEA5B2100C5B771 /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8E20DD52EB400FB1D6B /* SDL_main.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FD3F49720DEA5B2100C5B771 /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8E30DD52EB400FB1D6B /* SDL_mouse.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -321,6 +321,7 @@
 		0402A85612FE70C600CECEE3 /* SDL_shaders_gles2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_shaders_gles2.c; sourceTree = "<group>"; };
 		0402A85712FE70C600CECEE3 /* SDL_shaders_gles2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_shaders_gles2.h; sourceTree = "<group>"; };
 		04043B8C12FEA9350076DB1F /* SDL_opengles2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_opengles2.h; path = ../../include/SDL_opengles2.h; sourceTree = SOURCE_ROOT; };
+		0417A515130C988500578583 /* SDL_keycode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_keycode.h; path = ../../include/SDL_keycode.h; sourceTree = SOURCE_ROOT; };
 		041B2CD812FA0E9E0087D585 /* SDL_render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_render.h; path = ../../include/SDL_render.h; sourceTree = SOURCE_ROOT; };
 		041B2CEA12FA0F680087D585 /* SDL_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_render.c; sourceTree = "<group>"; };
 		041B2CEB12FA0F680087D585 /* SDL_sysrender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysrender.h; sourceTree = "<group>"; };
@@ -422,7 +423,6 @@
 		FD99B8DD0DD52EB400FB1D6B /* SDL_events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_events.h; path = ../../include/SDL_events.h; sourceTree = "<group>"; };
 		FD99B8DE0DD52EB400FB1D6B /* SDL_joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_joystick.h; path = ../../include/SDL_joystick.h; sourceTree = "<group>"; };
 		FD99B8DF0DD52EB400FB1D6B /* SDL_keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_keyboard.h; path = ../../include/SDL_keyboard.h; sourceTree = "<group>"; };
-		FD99B8E00DD52EB400FB1D6B /* SDL_keysym.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_keysym.h; path = ../../include/SDL_keysym.h; sourceTree = "<group>"; };
 		FD99B8E10DD52EB400FB1D6B /* SDL_loadso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_loadso.h; path = ../../include/SDL_loadso.h; sourceTree = "<group>"; };
 		FD99B8E20DD52EB400FB1D6B /* SDL_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_main.h; path = ../../include/SDL_main.h; sourceTree = "<group>"; };
 		FD99B8E30DD52EB400FB1D6B /* SDL_mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_mouse.h; path = ../../include/SDL_mouse.h; sourceTree = "<group>"; };
@@ -922,7 +922,7 @@
 				044E5FB411E6069F0076F181 /* SDL_input.h */,
 				FD99B8DE0DD52EB400FB1D6B /* SDL_joystick.h */,
 				FD99B8DF0DD52EB400FB1D6B /* SDL_keyboard.h */,
-				FD99B8E00DD52EB400FB1D6B /* SDL_keysym.h */,
+				0417A515130C988500578583 /* SDL_keycode.h */,
 				FD99B8E10DD52EB400FB1D6B /* SDL_loadso.h */,
 				04BAC0981300C0F70055DE28 /* SDL_log.h */,
 				FD99B8E20DD52EB400FB1D6B /* SDL_main.h */,
@@ -1176,7 +1176,6 @@
 				FD3F496C0DEA5B2100C5B771 /* SDL_events.h in Headers */,
 				FD3F496D0DEA5B2100C5B771 /* SDL_joystick.h in Headers */,
 				FD3F496E0DEA5B2100C5B771 /* SDL_keyboard.h in Headers */,
-				FD3F496F0DEA5B2100C5B771 /* SDL_keysym.h in Headers */,
 				FD3F49700DEA5B2100C5B771 /* SDL_loadso.h in Headers */,
 				FD3F49710DEA5B2100C5B771 /* SDL_main.h in Headers */,
 				FD3F49720DEA5B2100C5B771 /* SDL_mouse.h in Headers */,
@@ -1256,6 +1255,7 @@
 				04043B8D12FEA9350076DB1F /* SDL_opengles2.h in Headers */,
 				04BAC0991300C0F70055DE28 /* SDL_log.h in Headers */,
 				04BAC09C1300C1290055DE28 /* SDL_assert_c.h in Headers */,
+				0417A516130C988500578583 /* SDL_keycode.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index 03427ffa0..f34db22f6 100755
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -39,7 +39,6 @@
 		00162DB609BD222F0037C8D0 /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EE01191D2B7F000001 /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DB809BD222F0037C8D0 /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F001191D2B7F000001 /* SDL_joystick.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DB909BD222F0037C8D0 /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		00162DBA09BD222F0037C8D0 /* SDL_keysym.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F201191D2B7F000001 /* SDL_keysym.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DBB09BD222F0037C8D0 /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = B29A290D04E5B28700A80002 /* SDL_loadso.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DBC09BD222F0037C8D0 /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F301191D2B7F000001 /* SDL_main.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DBD09BD222F0037C8D0 /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F401191D2B7F000001 /* SDL_mouse.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -111,6 +110,8 @@
 		00D8DA2A1195093100638393 /* testsdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA1A1195093100638393 /* testsdl.c */; };
 		04043BBB12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */; };
 		04043BBC12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */; };
+		0417A4F4130C984E00578583 /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0417A4F3130C984E00578583 /* SDL_keycode.h */; };
+		0417A4F5130C984E00578583 /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0417A4F3130C984E00578583 /* SDL_keycode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		041B2C9512FA0D2A0087D585 /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2C9412FA0D2A0087D585 /* SDL_render.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		041B2C9612FA0D2A0087D585 /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = 041B2C9412FA0D2A0087D585 /* SDL_render.h */; };
 		041B2CA512FA0D680087D585 /* SDL_render.c in Sources */ = {isa = PBXBuildFile; fileRef = 041B2C9E12FA0D680087D585 /* SDL_render.c */; };
@@ -667,6 +668,7 @@
 		00D8DA1A1195093100638393 /* testsdl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testsdl.c; path = ../../test/automated/testsdl.c; sourceTree = SOURCE_ROOT; };
 		00F5D79E0990CA0D0051C449 /* UniversalBinaryNotes.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = UniversalBinaryNotes.rtf; sourceTree = "<group>"; };
 		04043BBA12FEB1BE0076DB1F /* SDL_glfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_glfuncs.h; sourceTree = "<group>"; };
+		0417A4F3130C984E00578583 /* SDL_keycode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_keycode.h; path = ../../include/SDL_keycode.h; sourceTree = SOURCE_ROOT; };
 		041B2C9412FA0D2A0087D585 /* SDL_render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_render.h; path = ../../include/SDL_render.h; sourceTree = SOURCE_ROOT; };
 		041B2C9E12FA0D680087D585 /* SDL_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_render.c; sourceTree = "<group>"; };
 		041B2C9F12FA0D680087D585 /* SDL_sysrender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysrender.h; sourceTree = "<group>"; };
@@ -895,7 +897,6 @@
 		0C5AF5EE01191D2B7F000001 /* SDL_events.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_events.h; path = ../../include/SDL_events.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5F001191D2B7F000001 /* SDL_joystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_joystick.h; path = ../../include/SDL_joystick.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_keyboard.h; path = ../../include/SDL_keyboard.h; sourceTree = SOURCE_ROOT; };
-		0C5AF5F201191D2B7F000001 /* SDL_keysym.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_keysym.h; path = ../../include/SDL_keysym.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5F301191D2B7F000001 /* SDL_main.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_main.h; path = ../../include/SDL_main.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5F401191D2B7F000001 /* SDL_mouse.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mouse.h; path = ../../include/SDL_mouse.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5F501191D2B7F000001 /* SDL_mutex.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mutex.h; path = ../../include/SDL_mutex.h; sourceTree = SOURCE_ROOT; };
@@ -1109,7 +1110,7 @@
 				04DEA56F11E6006A00386CAC /* SDL_input.h */,
 				0C5AF5F001191D2B7F000001 /* SDL_joystick.h */,
 				0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */,
-				0C5AF5F201191D2B7F000001 /* SDL_keysym.h */,
+				0417A4F3130C984E00578583 /* SDL_keycode.h */,
 				B29A290D04E5B28700A80002 /* SDL_loadso.h */,
 				04BAC0B21300C1CB0055DE28 /* SDL_log.h */,
 				0C5AF5F301191D2B7F000001 /* SDL_main.h */,
@@ -1771,7 +1772,6 @@
 				00162DB609BD222F0037C8D0 /* SDL_events.h in Headers */,
 				00162DB809BD222F0037C8D0 /* SDL_joystick.h in Headers */,
 				00162DB909BD222F0037C8D0 /* SDL_keyboard.h in Headers */,
-				00162DBA09BD222F0037C8D0 /* SDL_keysym.h in Headers */,
 				00162DBB09BD222F0037C8D0 /* SDL_loadso.h in Headers */,
 				00162DBC09BD222F0037C8D0 /* SDL_main.h in Headers */,
 				00162DBD09BD222F0037C8D0 /* SDL_mouse.h in Headers */,
@@ -1906,6 +1906,7 @@
 				04043BBB12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */,
 				04BAC0B31300C1CB0055DE28 /* SDL_log.h in Headers */,
 				0435673F1303160F00BA5428 /* SDL_shaders_gl.h in Headers */,
+				0417A4F5130C984E00578583 /* SDL_keycode.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2035,6 +2036,7 @@
 				04043BBC12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */,
 				04BAC0B41300C1CB0055DE28 /* SDL_log.h in Headers */,
 				043567411303160F00BA5428 /* SDL_shaders_gl.h in Headers */,
+				0417A4F4130C984E00578583 /* SDL_keycode.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/include/SDL_keyboard.h b/include/SDL_keyboard.h
index e465b1f35..abcd5ed63 100644
--- a/include/SDL_keyboard.h
+++ b/include/SDL_keyboard.h
@@ -31,7 +31,7 @@
 
 #include "SDL_stdinc.h"
 #include "SDL_error.h"
-#include "SDL_keysym.h"
+#include "SDL_keycode.h"
 #include "SDL_video.h"
 
 #include "begin_code.h"
diff --git a/include/SDL_keysym.h b/include/SDL_keycode.h
similarity index 99%
rename from include/SDL_keysym.h
rename to include/SDL_keycode.h
index 817fed7bf..c2927a677 100644
--- a/include/SDL_keysym.h
+++ b/include/SDL_keycode.h
@@ -21,13 +21,13 @@
 */
 
 /**
- *  \file SDL_keysym.h
+ *  \file SDL_keycode.h
  *  
  *  Defines constants which identify keyboard keys and modifiers.
  */
 
-#ifndef _SDL_keysym_h
-#define _SDL_keysym_h
+#ifndef _SDL_keycode_h
+#define _SDL_keycode_h
 
 #include "SDL_stdinc.h"
 #include "SDL_scancode.h"
@@ -337,6 +337,6 @@ typedef enum
 #define KMOD_ALT	(KMOD_LALT|KMOD_RALT)
 #define KMOD_GUI	(KMOD_LGUI|KMOD_RGUI)
 
-#endif /* _SDL_keysym_h */
+#endif /* _SDL_keycode_h */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_keyboard_c.h b/src/events/SDL_keyboard_c.h
index c92cd4714..3af4c54af 100644
--- a/src/events/SDL_keyboard_c.h
+++ b/src/events/SDL_keyboard_c.h
@@ -24,7 +24,7 @@
 #ifndef _SDL_keyboard_c_h
 #define _SDL_keyboard_c_h
 
-#include "SDL_keysym.h"
+#include "SDL_keycode.h"
 #include "SDL_events.h"
 
 /* Initialize the keyboard subsystem */
diff --git a/src/video/cocoa/SDL_cocoavideo.h b/src/video/cocoa/SDL_cocoavideo.h
index bf6d14fff..2d301c071 100644
--- a/src/video/cocoa/SDL_cocoavideo.h
+++ b/src/video/cocoa/SDL_cocoavideo.h
@@ -29,7 +29,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <Cocoa/Cocoa.h>
 
-#include "SDL_keysym.h"
+#include "SDL_keycode.h"
 #include "../SDL_sysvideo.h"
 
 #include "SDL_cocoaclipboard.h"
diff --git a/src/video/x11/SDL_x11video.h b/src/video/x11/SDL_x11video.h
index 3ae065740..b6865d1bc 100644
--- a/src/video/x11/SDL_x11video.h
+++ b/src/video/x11/SDL_x11video.h
@@ -24,7 +24,7 @@
 #ifndef _SDL_x11video_h
 #define _SDL_x11video_h
 
-#include "SDL_keysym.h"
+#include "SDL_keycode.h"
 
 #include "../SDL_sysvideo.h"