diff --git a/src/timer/win32/SDL_systimer.c b/src/timer/win32/SDL_systimer.c
index d9b5ce39d..16f06d75f 100644
--- a/src/timer/win32/SDL_systimer.c
+++ b/src/timer/win32/SDL_systimer.c
@@ -33,8 +33,11 @@ static char rcsid =
 #include "SDL_error.h"
 
 #ifdef _WIN32_WCE
-#define USE_GETTICKCOUNT
-#define USE_SETTIMER
+  #error This is WinCE. Please use src/timer/wince/SDL_systimer.c instead.
+
+  /* but if you really want to use this file, use these #defines... */
+  #define USE_GETTICKCOUNT
+  #define USE_SETTIMER
 #endif
 
 #define TIME_WRAP_VALUE	(~(DWORD)0)
diff --git a/src/timer/wince/SDL_systimer.c b/src/timer/wince/SDL_systimer.c
new file mode 100644
index 000000000..173b331ec
--- /dev/null
+++ b/src/timer/wince/SDL_systimer.c
@@ -0,0 +1,147 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2004 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id$";
+#endif
+
+#include <windows.h>
+#include <mmsystem.h>
+
+#include "SDL_timer.h"
+#include "SDL_timer_c.h"
+#include "SDL_error.h"
+
+static Uint64 start_date;
+static Uint64 start_ticks;
+
+static Uint64 wce_ticks(void)
+{
+  return((Uint64)GetTickCount());
+}
+
+static Uint64 wce_date(void)
+{
+  union
+  {
+	FILETIME ftime;
+	Uint64 itime;
+  } ftime;
+  SYSTEMTIME stime;
+
+  GetSystemTime(&stime);
+  SystemTimeToFileTime(&stime,&ftime.ftime);
+  ftime.itime/=10000; // Convert 100ns intervals to 1ms intervals
+  // Remove ms portion, which can't be relied on
+  ftime.itime -= (ftime.itime % 1000);
+  return(ftime.itime);
+}
+
+static Sint32 wce_rel_ticks(void)
+{
+  return((Sint32)(wce_ticks()-start_ticks));
+}
+
+static Sint32 wce_rel_date(void)
+{
+  return((Sint32)(wce_date()-start_date));
+}
+
+/* Return time in ms relative to when SDL was started */
+Uint32 SDL_GetTicks()
+{
+  Sint32 offset=wce_rel_date()-wce_rel_ticks();
+  if((offset < -1000) || (offset > 1000))
+  {
+//    fprintf(stderr,"Time desync(%+d), resyncing\n",offset/1000);
+	start_ticks-=offset;
+  }
+
+  return((Uint32)wce_rel_ticks());
+}
+
+/* Give up approx. givem milliseconds to the OS. */
+void SDL_Delay(Uint32 ms)
+{
+  Sleep(ms);
+}
+
+/* Recard start-time of application for reference */
+void SDL_StartTicks(void)
+{
+  start_date=wce_date();
+  start_ticks=wce_ticks();
+}
+
+static UINT WIN_timer;
+
+int SDL_SYS_TimerInit(void)
+{
+	return(0);
+}
+
+void SDL_SYS_TimerQuit(void)
+{
+	return;
+}
+
+/* Forward declaration because this is called by the timer callback */
+int SDL_SYS_StartTimer(void);
+
+static VOID CALLBACK TimerCallbackProc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
+{
+	Uint32 ms;
+
+	ms = SDL_alarm_callback(SDL_alarm_interval);
+	if ( ms != SDL_alarm_interval ) {
+		KillTimer(NULL, idEvent);
+		if ( ms ) {
+			SDL_alarm_interval = ROUND_RESOLUTION(ms);
+			SDL_SYS_StartTimer();
+		} else {
+			SDL_alarm_interval = 0;
+		}
+	}
+}
+
+int SDL_SYS_StartTimer(void)
+{
+	int retval;
+
+	WIN_timer = SetTimer(NULL, 0, SDL_alarm_interval, TimerCallbackProc);
+	if ( WIN_timer ) {
+		retval = 0;
+	} else {
+		retval = -1;
+	}
+	return retval;
+}
+
+void SDL_SYS_StopTimer(void)
+{
+	if ( WIN_timer ) {
+		KillTimer(NULL, WIN_timer);
+		WIN_timer = 0;
+	}
+}
+