Commit 6b0e1adfe9a4a4da503251dd1c9027c09ca47c83
2022-07-05T21:39:29
Merge commit '78089e6598240178b62d6720eec041cc698a5e7c' into main
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322
diff --git a/VisualC-GDK/SDL/SDL.vcxproj b/VisualC-GDK/SDL/SDL.vcxproj
index ffcb9c0..638264c 100644
--- a/VisualC-GDK/SDL/SDL.vcxproj
+++ b/VisualC-GDK/SDL/SDL.vcxproj
@@ -215,7 +215,6 @@
<ClInclude Include="..\..\src\events\SDL_gesture_c.h" />
<ClInclude Include="..\..\src\events\SDL_keyboard_c.h" />
<ClInclude Include="..\..\src\events\SDL_mouse_c.h" />
- <ClInclude Include="..\..\src\events\SDL_sysevents.h" />
<ClInclude Include="..\..\src\events\SDL_touch_c.h" />
<ClInclude Include="..\..\src\events\SDL_windowevents_c.h" />
<ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />
diff --git a/VisualC-GDK/SDL/SDL.vcxproj.filters b/VisualC-GDK/SDL/SDL.vcxproj.filters
index 8258e5a..02ca294 100644
--- a/VisualC-GDK/SDL/SDL.vcxproj.filters
+++ b/VisualC-GDK/SDL/SDL.vcxproj.filters
@@ -471,9 +471,6 @@
<ClInclude Include="..\..\src\events\SDL_mouse_c.h">
<Filter>events</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\events\SDL_sysevents.h">
- <Filter>events</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\events\SDL_touch_c.h">
<Filter>events</Filter>
</ClInclude>
diff --git a/VisualC-WinRT/SDL-UWP.vcxproj b/VisualC-WinRT/SDL-UWP.vcxproj
index a4d7744..aeaea7f 100644
--- a/VisualC-WinRT/SDL-UWP.vcxproj
+++ b/VisualC-WinRT/SDL-UWP.vcxproj
@@ -107,7 +107,6 @@
<ClInclude Include="..\src\events\SDL_events_c.h" />
<ClInclude Include="..\src\events\SDL_keyboard_c.h" />
<ClInclude Include="..\src\events\SDL_mouse_c.h" />
- <ClInclude Include="..\src\events\SDL_sysevents.h" />
<ClInclude Include="..\src\events\SDL_touch_c.h" />
<ClInclude Include="..\src\events\SDL_windowevents_c.h" />
<ClInclude Include="..\src\haptic\SDL_haptic_c.h" />
diff --git a/VisualC-WinRT/SDL-UWP.vcxproj.filters b/VisualC-WinRT/SDL-UWP.vcxproj.filters
index af1553b..98b117d 100644
--- a/VisualC-WinRT/SDL-UWP.vcxproj.filters
+++ b/VisualC-WinRT/SDL-UWP.vcxproj.filters
@@ -240,9 +240,6 @@
<ClInclude Include="..\src\events\SDL_mouse_c.h">
<Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="..\src\events\SDL_sysevents.h">
- <Filter>Source Files</Filter>
- </ClInclude>
<ClInclude Include="..\src\events\SDL_touch_c.h">
<Filter>Source Files</Filter>
</ClInclude>
diff --git a/VisualC/SDL/SDL.vcxproj b/VisualC/SDL/SDL.vcxproj
index 013ca02..8102c7f 100644
--- a/VisualC/SDL/SDL.vcxproj
+++ b/VisualC/SDL/SDL.vcxproj
@@ -320,7 +320,6 @@
<ClInclude Include="..\..\src\events\SDL_gesture_c.h" />
<ClInclude Include="..\..\src\events\SDL_keyboard_c.h" />
<ClInclude Include="..\..\src\events\SDL_mouse_c.h" />
- <ClInclude Include="..\..\src\events\SDL_sysevents.h" />
<ClInclude Include="..\..\src\events\SDL_touch_c.h" />
<ClInclude Include="..\..\src\events\SDL_windowevents_c.h" />
<ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />
diff --git a/VisualC/SDL/SDL.vcxproj.filters b/VisualC/SDL/SDL.vcxproj.filters
index a093f4d..16b7171 100644
--- a/VisualC/SDL/SDL.vcxproj.filters
+++ b/VisualC/SDL/SDL.vcxproj.filters
@@ -471,9 +471,6 @@
<ClInclude Include="..\..\src\events\SDL_mouse_c.h">
<Filter>events</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\events\SDL_sysevents.h">
- <Filter>events</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\events\SDL_touch_c.h">
<Filter>events</Filter>
</ClInclude>
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index c46915a..1c29341 100644
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -181,7 +181,6 @@
A75FCD3523E25AB700529352 /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
A75FCD3623E25AB700529352 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A89F23E2513F00DCD162 /* SDL_sysaudio.h */; };
A75FCD3723E25AB700529352 /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; settings = {ATTRIBUTES = (Public, ); }; };
- A75FCD3823E25AB700529352 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A75FCD3923E25AB700529352 /* math_libm.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A92623E2514000DCD162 /* math_libm.h */; };
A75FCD3A23E25AB700529352 /* SDL_uikitvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A62223E2513D00DCD162 /* SDL_uikitvideo.h */; };
A75FCD3B23E25AB700529352 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A69823E2513E00DCD162 /* SDL_cocoamouse.h */; };
@@ -560,7 +559,6 @@
A75FCEEE23E25AC700529352 /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
A75FCEEF23E25AC700529352 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A89F23E2513F00DCD162 /* SDL_sysaudio.h */; };
A75FCEF023E25AC700529352 /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; settings = {ATTRIBUTES = (Public, ); }; };
- A75FCEF123E25AC700529352 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A75FCEF223E25AC700529352 /* math_libm.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A92623E2514000DCD162 /* math_libm.h */; };
A75FCEF323E25AC700529352 /* SDL_uikitvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A62223E2513D00DCD162 /* SDL_uikitvideo.h */; };
A75FCEF423E25AC700529352 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A69823E2513E00DCD162 /* SDL_cocoamouse.h */; };
@@ -963,7 +961,6 @@
A769B0B923E259AE00872273 /* vk_sdk_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A73D23E2513E00DCD162 /* vk_sdk_platform.h */; };
A769B0BA23E259AE00872273 /* blank_cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93223E2514000DCD162 /* blank_cursor.h */; };
A769B0BC23E259AE00872273 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A89F23E2513F00DCD162 /* SDL_sysaudio.h */; };
- A769B0BE23E259AE00872273 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A769B0BF23E259AE00872273 /* math_libm.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A92623E2514000DCD162 /* math_libm.h */; };
A769B0C023E259AE00872273 /* SDL_uikitvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A62223E2513D00DCD162 /* SDL_uikitvideo.h */; };
A769B0C123E259AE00872273 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A69823E2513E00DCD162 /* SDL_cocoamouse.h */; };
@@ -3164,12 +3161,6 @@
A7D8BB9023E2514500DCD162 /* SDL_touch.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A93E23E2514000DCD162 /* SDL_touch.c */; };
A7D8BB9123E2514500DCD162 /* SDL_touch.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A93E23E2514000DCD162 /* SDL_touch.c */; };
A7D8BB9223E2514500DCD162 /* SDL_touch.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A93E23E2514000DCD162 /* SDL_touch.c */; };
- A7D8BB9323E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
- A7D8BB9423E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
- A7D8BB9523E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
- A7D8BB9623E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
- A7D8BB9723E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
- A7D8BB9823E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A7D8BB9923E2514500DCD162 /* SDL_gesture.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A94023E2514000DCD162 /* SDL_gesture.c */; };
A7D8BB9A23E2514500DCD162 /* SDL_gesture.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A94023E2514000DCD162 /* SDL_gesture.c */; };
A7D8BB9B23E2514500DCD162 /* SDL_gesture.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A94023E2514000DCD162 /* SDL_gesture.c */; };
@@ -3977,7 +3968,6 @@
A7D8A93C23E2514000DCD162 /* SDL_quit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_quit.c; sourceTree = "<group>"; };
A7D8A93D23E2514000DCD162 /* SDL_keyboard_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_keyboard_c.h; sourceTree = "<group>"; };
A7D8A93E23E2514000DCD162 /* SDL_touch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_touch.c; sourceTree = "<group>"; };
- A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysevents.h; sourceTree = "<group>"; };
A7D8A94023E2514000DCD162 /* SDL_gesture.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_gesture.c; sourceTree = "<group>"; };
A7D8A94123E2514000DCD162 /* scancodes_xfree86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scancodes_xfree86.h; sourceTree = "<group>"; };
A7D8A94223E2514000DCD162 /* SDL_events_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_events_c.h; sourceTree = "<group>"; };
@@ -5253,7 +5243,6 @@
A7D8A92B23E2514000DCD162 /* SDL_mouse_c.h */,
A7D8A92A23E2514000DCD162 /* SDL_mouse.c */,
A7D8A93C23E2514000DCD162 /* SDL_quit.c */,
- A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */,
A7D8A93723E2514000DCD162 /* SDL_touch_c.h */,
A7D8A93E23E2514000DCD162 /* SDL_touch.c */,
A7D8A94323E2514000DCD162 /* SDL_windowevents_c.h */,
@@ -5351,7 +5340,6 @@
A75FDBCC23EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A75FCD3623E25AB700529352 /* SDL_sysaudio.h in Headers */,
A75FCD3723E25AB700529352 /* SDL_haptic.h in Headers */,
- A75FCD3823E25AB700529352 /* SDL_sysevents.h in Headers */,
A75FCD3923E25AB700529352 /* math_libm.h in Headers */,
A75FCD3A23E25AB700529352 /* SDL_uikitvideo.h in Headers */,
A75FCD3B23E25AB700529352 /* SDL_cocoamouse.h in Headers */,
@@ -5578,7 +5566,6 @@
A75FDBCD23EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A75FCEEF23E25AC700529352 /* SDL_sysaudio.h in Headers */,
A75FCEF023E25AC700529352 /* SDL_haptic.h in Headers */,
- A75FCEF123E25AC700529352 /* SDL_sysevents.h in Headers */,
A75FCEF223E25AC700529352 /* math_libm.h in Headers */,
A75FCEF323E25AC700529352 /* SDL_uikitvideo.h in Headers */,
A75FCEF423E25AC700529352 /* SDL_cocoamouse.h in Headers */,
@@ -5784,7 +5771,6 @@
A75FDB5D23E39E6100529352 /* hidapi.h in Headers */,
A75FDBCA23EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A769B0BC23E259AE00872273 /* SDL_sysaudio.h in Headers */,
- A769B0BE23E259AE00872273 /* SDL_sysevents.h in Headers */,
A769B0BF23E259AE00872273 /* math_libm.h in Headers */,
A769B0C023E259AE00872273 /* SDL_uikitvideo.h in Headers */,
A769B0C123E259AE00872273 /* SDL_cocoamouse.h in Headers */,
@@ -6054,7 +6040,6 @@
A7D8B4C523E2514300DCD162 /* SDL_steamcontroller.h in Headers */,
A7D88A5223E2437C00DCD162 /* SDL_surface.h in Headers */,
A7D8B85B23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
- A7D8BB9423E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8AAD523E2514100DCD162 /* SDL_syshaptic.h in Headers */,
A7D8AAE123E2514100DCD162 /* SDL_syshaptic_c.h in Headers */,
A7D8B58223E2514300DCD162 /* SDL_sysjoystick.h in Headers */,
@@ -6286,7 +6271,6 @@
A7D8B4C623E2514300DCD162 /* SDL_steamcontroller.h in Headers */,
A7D88C0D23E24BED00DCD162 /* SDL_surface.h in Headers */,
A7D8B85C23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
- A7D8BB9523E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8AAD623E2514100DCD162 /* SDL_syshaptic.h in Headers */,
A7D8AAE223E2514100DCD162 /* SDL_syshaptic_c.h in Headers */,
A7D8B58323E2514300DCD162 /* SDL_sysjoystick.h in Headers */,
@@ -6415,7 +6399,6 @@
A75FDB5C23E39E6100529352 /* hidapi.h in Headers */,
A75FDBC923EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A7D8B85E23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
- A7D8BB9723E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8BB0723E2514500DCD162 /* math_libm.h in Headers */,
A7D8AC7F23E2514100DCD162 /* SDL_uikitvideo.h in Headers */,
A7D8AF2223E2514100DCD162 /* SDL_cocoamouse.h in Headers */,
@@ -6685,7 +6668,6 @@
A7D8BBC723E2561500DCD162 /* SDL_steamcontroller.h in Headers */,
AA75584C1595D4D800BBD41B /* SDL_surface.h in Headers */,
A7D8B85A23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
- A7D8BB9323E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8AAD423E2514100DCD162 /* SDL_syshaptic.h in Headers */,
A7D8AAE023E2514100DCD162 /* SDL_syshaptic_c.h in Headers */,
A7D8B58123E2514300DCD162 /* SDL_sysjoystick.h in Headers */,
@@ -6808,7 +6790,6 @@
A7D8BB4823E2514500DCD162 /* blank_cursor.h in Headers */,
F395C1962569C68F00942BFF /* SDL_iokitjoystick_c.h in Headers */,
A7D8B85D23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
- A7D8BB9623E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8BB0623E2514500DCD162 /* math_libm.h in Headers */,
A7D8AF2123E2514100DCD162 /* SDL_cocoamouse.h in Headers */,
A7D8ADEF23E2514100DCD162 /* SDL_blit_slow.h in Headers */,
@@ -7002,7 +6983,6 @@
DB313FD617554B71006C0E22 /* SDL_gesture.h in Headers */,
A7D8B85F23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
DB313FD717554B71006C0E22 /* SDL_haptic.h in Headers */,
- A7D8BB9823E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8BB0823E2514500DCD162 /* math_libm.h in Headers */,
A7D8AC8023E2514100DCD162 /* SDL_uikitvideo.h in Headers */,
A7D8AF2323E2514100DCD162 /* SDL_cocoamouse.h in Headers */,
diff --git a/src/events/SDL_sysevents.h b/src/events/SDL_sysevents.h
deleted file mode 100644
index a41df84..0000000
--- a/src/events/SDL_sysevents.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- Simple DirectMedia Layer
- Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-*/
-#include "../SDL_internal.h"
-
-#include "../video/SDL_sysvideo.h"
-
-/* Useful functions and variables from SDL_sysevents.c */
-
-#if defined(__HAIKU__)
-/* The Haiku event loops run in a separate thread */
-#define MUST_THREAD_EVENTS
-#endif
-
-#if defined(__WIN32__) || defined(__GDK__) /* Windows doesn't allow a separate event thread */
-#define CANT_THREAD_EVENTS
-#endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/nacl/SDL_naclevents.c b/src/video/nacl/SDL_naclevents.c
index 142d0c1..f161e9c 100644
--- a/src/video/nacl/SDL_naclevents.c
+++ b/src/video/nacl/SDL_naclevents.c
@@ -23,8 +23,8 @@
#if SDL_VIDEO_DRIVER_NACL
#include "SDL.h"
-#include "../../events/SDL_sysevents.h"
#include "../../events/SDL_events_c.h"
+#include "../SDL_sysvideo.h"
#include "SDL_naclevents_c.h"
#include "SDL_naclvideo.h"
#include "ppapi_simple/ps_event.h"
diff --git a/src/video/psp/SDL_pspevents.c b/src/video/psp/SDL_pspevents.c
index 04a8047..3d3f8ba 100644
--- a/src/video/psp/SDL_pspevents.c
+++ b/src/video/psp/SDL_pspevents.c
@@ -26,9 +26,9 @@
most of the API. */
#include "SDL.h"
-#include "../../events/SDL_sysevents.h"
#include "../../events/SDL_events_c.h"
#include "../../events/SDL_keyboard_c.h"
+#include "../SDL_sysvideo.h"
#include "SDL_pspvideo.h"
#include "SDL_pspevents_c.h"
#include "SDL_keyboard.h"
diff --git a/src/video/psp/SDL_pspevents_c.h b/src/video/psp/SDL_pspevents_c.h
index 8a55dde..1e1b490 100644
--- a/src/video/psp/SDL_pspevents_c.h
+++ b/src/video/psp/SDL_pspevents_c.h
@@ -21,9 +21,6 @@
#include "SDL_pspvideo.h"
-/* Variables and functions exported by SDL_sysevents.c to other parts
- of the native video subsystem (SDL_sysvideo.c)
-*/
extern void PSP_InitOSKeymap(_THIS);
extern void PSP_PumpEvents(_THIS);
diff --git a/src/video/raspberry/SDL_rpievents.c b/src/video/raspberry/SDL_rpievents.c
index 31cd1bd..c1c7bb7 100644
--- a/src/video/raspberry/SDL_rpievents.c
+++ b/src/video/raspberry/SDL_rpievents.c
@@ -23,9 +23,9 @@
#if SDL_VIDEO_DRIVER_RPI
-#include "../../events/SDL_sysevents.h"
#include "../../events/SDL_events_c.h"
#include "../../events/SDL_keyboard_c.h"
+#include "../SDL_sysvideo.h"
#include "SDL_rpivideo.h"
#include "SDL_rpievents_c.h"
diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c
index 3bac4c4..08a7e1a 100644
--- a/src/video/wayland/SDL_waylandevents.c
+++ b/src/video/wayland/SDL_waylandevents.c
@@ -28,9 +28,9 @@
#include "SDL_hints.h"
#include "../../core/unix/SDL_poll.h"
-#include "../../events/SDL_sysevents.h"
#include "../../events/SDL_events_c.h"
#include "../../events/scancodes_xfree86.h"
+#include "../SDL_sysvideo.h"
#include "SDL_waylandvideo.h"
#include "SDL_waylandevents_c.h"