diff --git a/lib/streambuf.c b/lib/streambuf.c
index dd2988a0e..c820f7c04 100644
--- a/lib/streambuf.c
+++ b/lib/streambuf.c
@@ -8,7 +8,11 @@
 #include <stdarg.h>
 #include <time.h>
 
+#ifndef CUSTOM_POLLER
 #include "poller.h"
+#else
+#include "custom_poller.h"
+#endif
 #include "auxlib.h"
 
 
diff --git a/recording-daemon/Makefile b/recording-daemon/Makefile
index e5a441487..7810dd2d9 100644
--- a/recording-daemon/Makefile
+++ b/recording-daemon/Makefile
@@ -45,8 +45,10 @@ LDLIBS+=	$(LDLIBS_LIBCURL)
 CFLAGS+=	$(CFLAGS_BCG729)
 LDLIBS+=	$(LDLIBS_BCG729)
 
+CFLAGS+=	-DCUSTOM_POLLER
+
 SRCS=		epoll.c garbage.c inotify.c main.c metafile.c stream.c recaux.c packet.c \
-		decoder.c output.c mix.c db.c log.c forward.c tag.c poller.c notify.c tls_send.c
+		decoder.c output.c mix.c db.c log.c forward.c tag.c custom_poller.c notify.c tls_send.c
 LIBSRCS=	loglib.c auxlib.c rtplib.c codeclib.strhash.c resample.c str.c socket.c streambuf.c ssllib.c \
 		dtmflib.c bufferpool.c bencode.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/recording-daemon/poller.c b/recording-daemon/custom_poller.c
similarity index 89%
rename from recording-daemon/poller.c
rename to recording-daemon/custom_poller.c
index 32331205b..0b6edfa5d 100644
--- a/recording-daemon/poller.c
+++ b/recording-daemon/custom_poller.c
@@ -1,4 +1,4 @@
-#include "poller.h"
+#include "custom_poller.h"
 
 void poller_blocked(struct poller *p, void *fdp) {
 	p->state = PS_WRITE_BLOCKED;
diff --git a/recording-daemon/poller.h b/recording-daemon/custom_poller.h
similarity index 100%
rename from recording-daemon/poller.h
rename to recording-daemon/custom_poller.h
diff --git a/recording-daemon/types.h b/recording-daemon/types.h
index 9c50dcf9c..9be96ae38 100644
--- a/recording-daemon/types.h
+++ b/recording-daemon/types.h
@@ -13,7 +13,7 @@
 #include <openssl/ssl.h>
 #include "str.h"
 #include "codeclib.h"
-#include "poller.h"
+#include "custom_poller.h"
 #include "socket.h"
 #include "containers.h"