diff --git a/configure.ac b/configure.ac
index 1cb327e83..d3c1df114 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,7 +302,7 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h])
 AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h sys/sendfile.h])
 AC_CHECK_HEADERS(execinfo.h,,,)
-AC_CHECK_HEADERS(syscall.h,,,)
+AC_CHECK_HEADERS(sys/syscall.h,,,)
 AC_CHECK_HEADERS(pthread.h,,,)
 AC_CHECK_HEADERS(linux/videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),)
 AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_HAS_V4L2,1),AC_SUBST(ZM_HAS_V4L2,0),)
diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index 6507191cd..19886ef1c 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -28,9 +28,6 @@
 #include <string.h>
 #include <sys/time.h>
 #include <syslog.h>
-#ifdef HAVE_SYSCALL_H
-#include <syscall.h>
-#endif // HAVE_SYSCALL_H
 #include <signal.h>
 #include <stdarg.h>
 #include <errno.h>
diff --git a/src/zm_logger.h b/src/zm_logger.h
index 188aed518..b0a5ef8e3 100644
--- a/src/zm_logger.h
+++ b/src/zm_logger.h
@@ -23,6 +23,9 @@
 #include <unistd.h>
 #include <string>
 #include <map>
+#ifdef HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif // HAVE_SYS_SYSCALL_H
 #include <mysql/mysql.h>
 
 class Logger
diff --git a/src/zm_thread.h b/src/zm_thread.h
index c9bb37c83..6a0d169f0 100644
--- a/src/zm_thread.h
+++ b/src/zm_thread.h
@@ -23,7 +23,9 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <unistd.h>
-#include <syscall.h>
+#ifdef HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif // HAVE_SYS_SYSCALL_H
 #include "zm_exception.h"
 #include "zm_utils.h"
 
diff --git a/src/zm_timer.h b/src/zm_timer.h
index ed6bf5b36..6c7663b87 100644
--- a/src/zm_timer.h
+++ b/src/zm_timer.h
@@ -20,7 +20,9 @@
 #ifndef ZM_TIMER_H
 #define ZM_TIMER_H
 
-#include <syscall.h>
+#ifdef HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif // HAVE_SYS_SYSCALL_H
 #include "zm_thread.h"
 
 #include "zm_exception.h"