diff --git a/core-buffer/include/UdpReceiver.hpp b/core-buffer/include/UdpReceiver.hpp
index 5c9d6df..2ff9709 100644
--- a/core-buffer/include/UdpReceiver.hpp
+++ b/core-buffer/include/UdpReceiver.hpp
@@ -1,9 +1,8 @@
 #ifndef UDPRECEIVER_H
 #define UDPRECEIVER_H
 
-#include "config.hpp"
 #include <sys/socket.h>
-#include "RingBuffer.hpp"
+#include "buffer_config.hpp"
 
 class UdpReceiver {
 
@@ -18,7 +17,7 @@ public:
 
     void bind(
             const uint16_t port,
-            const size_t usec_timeout=config::udp_usec_timeout);
+            const size_t usec_timeout=core_buffer::BUFFER_UDP_US_TIMEOUT);
     void close();
 };
 
diff --git a/core-buffer/include/buffer_config.hpp b/core-buffer/include/buffer_config.hpp
index 8188d70..3b8b0d0 100644
--- a/core-buffer/include/buffer_config.hpp
+++ b/core-buffer/include/buffer_config.hpp
@@ -28,6 +28,9 @@ namespace core_buffer {
     // Size of sf_buffer RB in elements.
     const size_t BUFFER_RB_SIZE = 1000;
 
+    // Microseconds timeout for UDP recv.
+    const int BUFFER_UDP_US_TIMEOUT = 10 * 1000;
+
     // ZMQ threads for receiving data from sf_replay.
     const int WRITER_ZMQ_IO_THREADS = 2;
 
diff --git a/core-buffer/src/UdpReceiver.cpp b/core-buffer/src/UdpReceiver.cpp
index b4759a2..ad1be4a 100644
--- a/core-buffer/src/UdpReceiver.cpp
+++ b/core-buffer/src/UdpReceiver.cpp
@@ -2,6 +2,7 @@
 #include <iostream>
 #include "UdpReceiver.hpp"
 #include "jungfrau.hpp"
+#include "date.h"
 
 using namespace std;