diff --git a/daemon/.gitignore b/daemon/.gitignore
index 54e70e7b2..6452ebf8c 100644
--- a/daemon/.gitignore
+++ b/daemon/.gitignore
@@ -26,3 +26,4 @@ mix_buffer.c
 mix_in_x64_avx2.S
 mix_in_x64_avx512bw.S
 mix_in_x64_sse2.S
+poller.c
diff --git a/daemon/Makefile b/daemon/Makefile
index 0a83827f3..8b7b9c57c 100644
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -78,13 +78,13 @@ endif
 
 include ../lib/mqtt.Makefile
 
-SRCS=		main.c kernel.c poller.c helpers.c control_tcp.c call.c control_udp.c redis.c \
+SRCS=		main.c kernel.c helpers.c control_tcp.c call.c control_udp.c redis.c \
 		bencode.c cookie_cache.c udp_listener.c control_ng.strhash.c sdp.strhash.c stun.c rtcp.c \
 		crypto.c rtp.c call_interfaces.strhash.c dtls.c log.c cli.c graphite.c ice.c \
 		media_socket.c homer.c recording.c statistics.c cdr.c ssrc.c iptables.c tcp_listener.c \
 		codec.c load.c dtmf.c timerthread.c media_player.c jitter_buffer.c t38.c websocket.c \
 		mqtt.c janus.strhash.c audio_player.c
-LIBSRCS=	loglib.c auxlib.c rtplib.c str.c socket.c streambuf.c ssllib.c dtmflib.c mix_buffer.c
+LIBSRCS=	loglib.c auxlib.c rtplib.c str.c socket.c streambuf.c ssllib.c dtmflib.c mix_buffer.c poller.c
 ifeq ($(with_transcoding),yes)
 LIBSRCS+=	codeclib.strhash.c resample.c
 LIBASM=		mvr2s_x64_avx2.S mvr2s_x64_avx512.S mix_in_x64_avx2.S mix_in_x64_avx512bw.S mix_in_x64_sse2.S
diff --git a/include/obj.h b/lib/obj.h
similarity index 100%
rename from include/obj.h
rename to lib/obj.h
diff --git a/daemon/poller.c b/lib/poller.c
similarity index 100%
rename from daemon/poller.c
rename to lib/poller.c
diff --git a/include/poller.h b/lib/poller.h
similarity index 100%
rename from include/poller.h
rename to lib/poller.h