diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc
index 44ea69a2..7d7a84bd 100644
--- a/src/FbTk/Timer.cc
+++ b/src/FbTk/Timer.cc
@@ -36,15 +36,21 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
 #ifdef HAVE_CASSERT
   #include <cassert>
 #else
   #include <assert.h>
 #endif
 
+// sys/select.h on solaris wants to use memset()
+#ifdef HAVE_CSTRING
+#  include <cstring>
+#else
+#  include <string.h>
+#endif
+
+#include <sys/select.h>
+
 namespace FbTk {
 
 Timer::TimerList Timer::m_timerlist;
@@ -90,7 +96,7 @@ void Timer::start() {
     if ((! m_timing || m_interval != 0) && *m_handler) {
         m_timing = true;
         addTimer(this); //add us to the list
-    }        
+    }
 }
 
 
diff --git a/src/FbTk/Timer.hh b/src/FbTk/Timer.hh
index 4893fdb8..6be269b0 100644
--- a/src/FbTk/Timer.hh
+++ b/src/FbTk/Timer.hh
@@ -45,7 +45,6 @@
 #endif // HAVE_INTTYPES_H
 
 #include <sys/types.h>
-#include <sys/select.h>
 #include <sys/time.h>
 #include <unistd.h>