diff --git a/src/clock.cpp b/src/clock.cpp
index d3ee8d1..69f6c62 100644
--- a/src/clock.cpp
+++ b/src/clock.cpp
@@ -85,7 +85,6 @@ void Clock::addTimer(int timeout)
 
 Clock::Clock(void)
 {
-	SDL_InitSubSystem(SDL_INIT_TIMER);
 	tzset();
 
 	int sec = update();
@@ -95,7 +94,6 @@ Clock::Clock(void)
 Clock::~Clock()
 {
 	SDL_RemoveTimer(timer);
-	SDL_QuitSubSystem(SDL_INIT_TIMER);
 	instance = NULL;
 }
 
diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp
index c1af3f4..5f2b248 100644
--- a/src/gmenu2x.cpp
+++ b/src/gmenu2x.cpp
@@ -223,7 +223,7 @@ GMenu2X::GMenu2X()
 	setenv("SDL_FBCON_DONT_CLEAR", "1", 0);
 
 	//Screen
-	if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_JOYSTICK)<0 ) {
+	if( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER) < 0) {
 		ERROR("Could not initialize SDL: %s\n", SDL_GetError());
 		quit();
 	}
diff --git a/src/powersaver.cpp b/src/powersaver.cpp
index 1a71a13..35ea634 100644
--- a/src/powersaver.cpp
+++ b/src/powersaver.cpp
@@ -36,14 +36,12 @@ bool PowerSaver::isRunning() {
 }
 
 PowerSaver::PowerSaver() {
-	SDL_InitSubSystem(SDL_INIT_TIMER);
 	setScreenTimeout(0);
 	screenTimer = NULL;
 }
 
 PowerSaver::~PowerSaver() {
 	SDL_RemoveTimer(screenTimer);
-	SDL_QuitSubSystem(SDL_INIT_TIMER);
 	instance = NULL;
 }