--- a/src/events/SDL_events_c.h	Mon May 29 05:08:33 2006 +0000
+++ b/src/events/SDL_events_c.h	Wed Jun 07 16:10:28 2006 +0000
@@ -23,6 +23,7 @@
 
 /* Useful functions and variables from SDL_events.c */
 #include "SDL_events.h"
+#include "SDL_mouse_c.h"
 
 /* Start and stop the event processing loop */
 extern int SDL_StartEventLoop(Uint32 flags);
@@ -33,41 +34,25 @@
 extern void SDL_Unlock_EventThread(void);
 extern Uint32 SDL_EventThreadID(void);
 
-/* Event handler init routines */
 extern int SDL_KeyboardInit(void);
-extern int SDL_MouseInit(void);
-extern int SDL_QuitInit(void);
+extern int SDL_SendKeyboard(Uint8 state, SDL_keysym * key);
+extern void SDL_KeyboardQuit(void);
 
-/* Event handler quit routines */
-extern void SDL_KeyboardQuit(void);
-extern void SDL_MouseQuit(void);
+extern int SDL_QuitInit(void);
+extern int SDL_SendQuit(void);
 extern void SDL_QuitQuit(void);
 
+extern int SDL_SendWindowEvent(SDL_WindowID windowID, Uint8 windowevent,
+                               int data1, int data2);
+
+extern int SDL_SendSysWMEvent(SDL_SysWMmsg * message);
+
 /* The event filter function */
 extern SDL_EventFilter SDL_EventOK;
 
 /* The array of event processing states */
 extern Uint8 SDL_ProcessEvents[SDL_NUMEVENTS];
 
-/* Internal event queueing functions
-   (from SDL_mouse.c, SDL_keyboard.c, SDL_quit.c, SDL_events.c, SDL_windowevents.c)
- */
-extern int SDL_PrivateWindowEvent(SDL_WindowID windowID, Uint8 windowevent,
-                                  int data1, int data2);
-extern int SDL_PrivateMouseMotion(Uint8 buttonstate, int relative, Sint16 x,
-                                  Sint16 y);
-extern int SDL_PrivateMouseButton(Uint8 state, Uint8 button, Sint16 x,
-                                  Sint16 y);
-extern int SDL_PrivateKeyboard(Uint8 state, SDL_keysym * key);
-extern int SDL_PrivateQuit(void);
-extern int SDL_PrivateSysWMEvent(SDL_SysWMmsg * message);
-
-/* Used by the activity event handler to remove mouse focus */
-extern void SDL_ResetMouse(void);
-
-/* Used by the activity event handler to remove keyboard focus */
-extern void SDL_ResetKeyboard(void);
-
 /* Used by the event loop to queue pending keyboard repeat events */
 extern void SDL_CheckKeyRepeat(void);