diff --git a/repertory/librepertory/include/utils/timeout.hpp b/repertory/librepertory/include/utils/timeout.hpp
index 5affb4d1..036b6ba6 100644
--- a/repertory/librepertory/include/utils/timeout.hpp
+++ b/repertory/librepertory/include/utils/timeout.hpp
@@ -32,13 +32,13 @@ public:
 
 public:
   timeout(std::function<void()> timeout_callback,
-          const std::chrono::system_clock::duration &duration = 10s);
+          std::chrono::system_clock::duration duration);
 
   ~timeout() { disable(); }
 
 private:
   std::atomic<bool> timeout_killed_;
-  std::unique_ptr<std::thread> timeout_thread_;
+  std::unique_ptr<std::thread> timeout_thread_{nullptr};
   std::mutex timeout_mutex_;
   std::condition_variable timeout_notify_;
 
diff --git a/repertory/librepertory/src/utils/timeout.cpp b/repertory/librepertory/src/utils/timeout.cpp
index 76139da7..60d19257 100644
--- a/repertory/librepertory/src/utils/timeout.cpp
+++ b/repertory/librepertory/src/utils/timeout.cpp
@@ -21,11 +21,9 @@
 */
 #include "utils/timeout.hpp"
 
-#include "types/repertory.hpp"
-
 namespace repertory {
 timeout::timeout(std::function<void()> timeout_callback,
-                 const std::chrono::system_clock::duration &duration)
+                 std::chrono::system_clock::duration duration)
     : timeout_killed_(duration == 0s) {
   if (timeout_killed_) {
     return;