diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3072ac13..fe3ff6e3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,10 +36,14 @@ endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/build.h)
 
 set(conky_sources colours.cc combine.cc common.cc conky.cc core.cc
 	diskio.cc entropy.cc exec.cc fs.cc mail.cc mixer.cc net_stat.cc template.c
-	timed_thread.cc mboxscan.c read_tcp.c scroll.cc specials.cc tailhead.cc
+	mboxscan.c read_tcp.c scroll.cc specials.cc tailhead.cc
 	temphelper.cc text_object.c timeinfo.c top.cc algebra.c prioqueue.c proc.c
 	user.c)
 
+# add timed thread library
+add_library(timed-thread timed-thread.cc)
+set(conky_libs ${conky_libs} timed-thread)
+
 # Platform specific sources
 if(OS_LINUX)
 	set(linux linux.cc users.cc sony.c i8k.cc)
diff --git a/src/audacious.h b/src/audacious.h
index 08e6f85d..16382589 100644
--- a/src/audacious.h
+++ b/src/audacious.h
@@ -25,7 +25,7 @@
 #ifndef AUDACIOUS_H
 #define AUDACIOUS_H
 
-#include "timed_thread.h"
+#include "timed-thread.h"
 
 enum _audacious_items {
 	AUDACIOUS_STATUS = 0,
diff --git a/src/ccurl_thread.h b/src/ccurl_thread.h
index da237389..f8c96be5 100644
--- a/src/ccurl_thread.h
+++ b/src/ccurl_thread.h
@@ -27,7 +27,7 @@
 #define _CURL_THREAD_H_
 
 #include <list>
-#include "timed_thread.h"
+#include "timed-thread.h"
 
 /* curl thread lib exports begin */
 
diff --git a/src/conky.cc b/src/conky.cc
index 6fead3e1..724907c2 100644
--- a/src/conky.cc
+++ b/src/conky.cc
@@ -32,7 +32,7 @@
 #include "text_object.h"
 #include "conky.h"
 #include "common.h"
-#include "timed_thread.h"
+#include "timed-thread.h"
 #include <stdarg.h>
 #include <cmath>
 #include <ctime>
diff --git a/src/exec.cc b/src/exec.cc
index fa11e5b4..e95a53eb 100644
--- a/src/exec.cc
+++ b/src/exec.cc
@@ -33,7 +33,7 @@
 #include "logging.h"
 #include "specials.h"
 #include "text_object.h"
-#include "timed_thread.h"
+#include "timed-thread.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/src/mail.cc b/src/mail.cc
index e171e1dd..5326f4ff 100644
--- a/src/mail.cc
+++ b/src/mail.cc
@@ -33,7 +33,7 @@
 #include "common.h"
 #include "logging.h"
 #include "text_object.h"
-#include "timed_thread.h"
+#include "timed-thread.h"
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/moc.cc b/src/moc.cc
index fe1a0a04..09464894 100644
--- a/src/moc.cc
+++ b/src/moc.cc
@@ -24,7 +24,7 @@
 #include "conky.h"
 #include "logging.h"
 #include "text_object.h"
-#include "timed_thread.h"
+#include "timed-thread.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/mpd.cc b/src/mpd.cc
index dc405fae..40cf51f2 100644
--- a/src/mpd.cc
+++ b/src/mpd.cc
@@ -30,7 +30,7 @@
 #include <mutex>
 #include "conky.h"
 #include "logging.h"
-#include "timed_thread.h"
+#include "timed-thread.h"
 #include "timeinfo.h"
 #include "libmpdclient.h"
 #include "mpd.h"
diff --git a/src/timed_thread.cc b/src/timed-thread.cc
similarity index 99%
rename from src/timed_thread.cc
rename to src/timed-thread.cc
index 7719e249..d60cb517 100644
--- a/src/timed_thread.cc
+++ b/src/timed-thread.cc
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
-#include "timed_thread.h"
+#include "timed-thread.h"
 #include "logging.h"
 
 /* Abstraction layer for timed threads */
diff --git a/src/timed_thread.h b/src/timed-thread.h
similarity index 100%
rename from src/timed_thread.h
rename to src/timed-thread.h