Merge branch 'master' into followname

Conflicts:

	inotail.c

1 files changed, 1 insertions, 3 deletions

diff --git a/inotail.c b/inotail.c
index 2fa7017..9dae0b8 100644
--- a/inotail.c
+++ b/inotail.c
@@ -33,9 +33,7 @@
 #include <libgen.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
-#include "inotify.h"
-#include "inotify-syscalls.h"
+#include <sys/inotify.h>
 
 #include "inotail.h"