diff --git a/Makefile.am b/Makefile.am
index 4b043d5c4..869736ff9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,8 +173,7 @@ src_mpd_SOURCES = \
 	src/TimePrint.cxx src/TimePrint.hxx \
 	src/mixer/Volume.cxx src/mixer/Volume.hxx \
 	src/SongFilter.cxx src/SongFilter.hxx \
-	src/PlaylistFile.cxx src/PlaylistFile.hxx \
-	src/Timer.cxx src/Timer.hxx
+	src/PlaylistFile.cxx src/PlaylistFile.hxx
 
 if ENABLE_DATABASE
 src_mpd_SOURCES += \
@@ -1029,6 +1028,7 @@ OUTPUT_API_SRC = \
 	src/output/Init.cxx
 
 liboutput_plugins_a_SOURCES = \
+	src/output/Timer.cxx src/output/Timer.hxx \
 	src/output/plugins/NullOutputPlugin.cxx \
 	src/output/plugins/NullOutputPlugin.hxx
 
@@ -1659,7 +1659,6 @@ test_run_output_SOURCES = test/run_output.cxx \
 	src/CheckAudioFormat.cxx \
 	src/AudioFormat.cxx \
 	src/AudioParser.cxx \
-	src/Timer.cxx \
 	src/Page.cxx \
 	src/output/Domain.cxx \
 	src/output/Init.cxx src/output/Finish.cxx src/output/Registry.cxx \
diff --git a/src/Timer.cxx b/src/output/Timer.cxx
similarity index 100%
rename from src/Timer.cxx
rename to src/output/Timer.cxx
diff --git a/src/Timer.hxx b/src/output/Timer.hxx
similarity index 100%
rename from src/Timer.hxx
rename to src/output/Timer.hxx
diff --git a/src/output/plugins/FifoOutputPlugin.cxx b/src/output/plugins/FifoOutputPlugin.cxx
index 0c7fb421e..9df5a74dd 100644
--- a/src/output/plugins/FifoOutputPlugin.cxx
+++ b/src/output/plugins/FifoOutputPlugin.cxx
@@ -21,7 +21,7 @@
 #include "FifoOutputPlugin.hxx"
 #include "config/ConfigError.hxx"
 #include "../OutputAPI.hxx"
-#include "Timer.hxx"
+#include "../Timer.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
 #include "util/Error.hxx"
diff --git a/src/output/plugins/HttpdInternal.hxx b/src/output/plugins/HttpdInternal.hxx
index a4c0477f0..53029edc6 100644
--- a/src/output/plugins/HttpdInternal.hxx
+++ b/src/output/plugins/HttpdInternal.hxx
@@ -26,7 +26,7 @@
 #define MPD_OUTPUT_HTTPD_INTERNAL_H
 
 #include "../Internal.hxx"
-#include "Timer.hxx"
+#include "../Timer.hxx"
 #include "thread/Mutex.hxx"
 #include "event/ServerSocket.hxx"
 #include "event/DeferredMonitor.hxx"
diff --git a/src/output/plugins/NullOutputPlugin.cxx b/src/output/plugins/NullOutputPlugin.cxx
index 53140a475..098f58926 100644
--- a/src/output/plugins/NullOutputPlugin.cxx
+++ b/src/output/plugins/NullOutputPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "NullOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "Timer.hxx"
+#include "../Timer.hxx"
 
 struct NullOutput {
 	AudioOutput base;