diff --git a/backends/module.mk b/backends/module.mk
index 257ae0db9c1..59df56b4685 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -40,6 +40,7 @@ MODULE_OBJS := \
 	saves/posix/posix-saves.o \
 	saves/psp/psp-saves.o \
 	timer/default/default-timer.o \
+	timer/psp/timer.o \
 	vkeybd/image-map.o \
 	vkeybd/polygon.o \
 	vkeybd/virtual-keyboard.o \
diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile
index 6acd8e970ab..6967973da75 100644
--- a/backends/platform/psp/Makefile
+++ b/backends/platform/psp/Makefile
@@ -148,8 +148,7 @@ OBJS := powerman.o \
 	trace.o \
 	psploader.o \
 	pspkeyboard.o \
-	audio.o \
-	timer.o
+	audio.o
 
 # Include common Scummvm makefile
 include $(srcdir)/Makefile.common
diff --git a/backends/platform/psp/module.mk b/backends/platform/psp/module.mk
index 461df629bfc..0e5bd8737d1 100644
--- a/backends/platform/psp/module.mk
+++ b/backends/platform/psp/module.mk
@@ -13,8 +13,7 @@ MODULE_OBJS := powerman.o \
 	trace.o \
 	psploader.o \
 	pspkeyboard.o \
-	audio.o \
-	timer.o
+	audio.o
 
 MODULE_DIRS += \
 	backends/platform/psp/
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 413de0f5286..3f075d01396 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -39,7 +39,7 @@
 #include "backends/platform/psp/display_manager.h"
 #include "backends/platform/psp/input.h"
 #include "backends/platform/psp/audio.h"
-#include "backends/platform/psp/timer.h"
+#include "backends/timer/psp/timer.h"
 
 #include <SDL.h>
 
diff --git a/backends/platform/psp/timer.cpp b/backends/timer/psp/timer.cpp
similarity index 96%
rename from backends/platform/psp/timer.cpp
rename to backends/timer/psp/timer.cpp
index a35bd9d8278..55b63ba4fd0 100644
--- a/backends/platform/psp/timer.cpp
+++ b/backends/timer/psp/timer.cpp
@@ -23,12 +23,13 @@
  *
  */
 
+#if defined (__PSP__) 
 #include <pspthreadman.h>
 
 #include "common/scummsys.h"
 #include "common/timer.h"
 #include "backends/platform/psp/thread.h"
-#include "backends/platform/psp/timer.h"
+#include "backends/timer/psp/timer.h"
 
 //#define __PSP_DEBUG_FUNCS__	/* For debugging function calls */
 //#define __PSP_DEBUG_PRINT__	/* For debug printouts */
@@ -78,3 +79,5 @@ void PspTimer::timerThread() {
 		_callback();
 	}
 };
+
+#endif /* __PSP__ */
diff --git a/backends/platform/psp/timer.h b/backends/timer/psp/timer.h
similarity index 100%
rename from backends/platform/psp/timer.h
rename to backends/timer/psp/timer.h