diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c
index 26b8538e3..911a73305 100644
--- a/api/src/glfs-mgmt.c
+++ b/api/src/glfs-mgmt.c
@@ -19,7 +19,7 @@
 #include "glusterfs.h"
 #include "glfs.h"
 #include "dict.h"
-#include "event.h"
+#include "gf-event.h"
 #include "defaults.h"
 
 #include "rpc-clnt.h"
diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c
index 4b764d941..e7dd7dca1 100644
--- a/api/src/glfs-resolve.c
+++ b/api/src/glfs-resolve.c
@@ -19,7 +19,7 @@
 #include "glusterfs.h"
 #include "logging.h"
 #include "stack.h"
-#include "event.h"
+#include "gf-event.h"
 #include "glfs-mem-types.h"
 #include "common-utils.h"
 #include "syncop.h"
diff --git a/api/src/glfs.c b/api/src/glfs.c
index 694e5e6f9..652520c41 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -38,7 +38,7 @@
 #include "glusterfs.h"
 #include "logging.h"
 #include "stack.h"
-#include "event.h"
+#include "gf-event.h"
 #include "glfs-mem-types.h"
 #include "common-utils.h"
 #include "syncop.h"
diff --git a/cli/src/cli-rl.c b/cli/src/cli-rl.c
index 4745cf493..1bb9bf07c 100644
--- a/cli/src/cli-rl.c
+++ b/cli/src/cli-rl.c
@@ -17,7 +17,7 @@
 #include "cli-cmd.h"
 #include "cli-mem-types.h"
 
-#include "event.h"
+#include "gf-event.h"
 
 #include <fnmatch.h>
 
diff --git a/cli/src/cli.c b/cli/src/cli.c
index 1ae56e8f5..025f72c97 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -54,7 +54,7 @@
 #include "stack.h"
 #include "revision.h"
 #include "common-utils.h"
-#include "event.h"
+#include "gf-event.h"
 #include "syscall.h"
 #include "call-stub.h"
 #include <fnmatch.h>
diff --git a/configure.ac b/configure.ac
index 627a7a939..3c9602033 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1658,6 +1658,9 @@ AC_SUBST([GF_CPPFLAGS])
 AM_CONDITIONAL([GF_LINUX_HOST_OS], test "${GF_HOST_OS}" = "GF_LINUX_HOST_OS")
 AM_CONDITIONAL([GF_DARWIN_HOST_OS], test "${GF_HOST_OS}" = "GF_DARWIN_HOST_OS")
 AM_CONDITIONAL([GF_BSD_HOST_OS], test "${GF_HOST_OS}" = "GF_BSD_HOST_OS")
+if  test "${GF_HOST_OS}" = "GF_BSD_HOST_OS"; then
+    AC_DEFINE(GF_BSD_HOST_OS, 1, [This is a BSD compatible OS.])
+fi
 
 AC_SUBST(GLUSTERD_WORKDIR)
 AM_CONDITIONAL([GF_INSTALL_GLUSTERD_WORKDIR], test ! -d ${GLUSTERD_WORKDIR} && test -d ${sysconfdir}/glusterd )
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index 1e9015440..e954c1f3d 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -15,7 +15,7 @@
 
 #include "glusterfs.h"
 #include "dict.h"
-#include "event.h"
+#include "gf-event.h"
 #include "defaults.h"
 
 #include "rpc-clnt.h"
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index c16d2b6b9..d4b3a1139 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -64,7 +64,7 @@
 #include "glusterfsd.h"
 #include "revision.h"
 #include "common-utils.h"
-#include "event.h"
+#include "gf-event.h"
 #include "statedump.h"
 #include "latency.h"
 #include "glusterfsd-mem-types.h"
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am
index fc7cb8fd0..bfe0900e5 100644
--- a/libglusterfs/src/Makefile.am
+++ b/libglusterfs/src/Makefile.am
@@ -49,7 +49,7 @@ protocol-common.h: $(top_srcdir)/rpc/rpc-lib/src/protocol-common.h
 libglusterfs_la_HEADERS = common-utils.h defaults.h default-args.h \
 	dict.h glusterfs.h hashfn.h timespec.h logging.h xlator.h \
 	stack.h timer.h list.h inode.h call-stub.h compat.h fd.h \
-	revision.h compat-errno.h event.h mem-pool.h byte-order.h \
+	revision.h compat-errno.h gf-event.h mem-pool.h byte-order.h \
 	gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h \
 	checksum.h daemon.h store.h rbthash.h iatt.h latency.h \
 	mem-types.h syncop.h cluster-syncop.h graph-utils.h trie.h \
diff --git a/libglusterfs/src/event-epoll.c b/libglusterfs/src/event-epoll.c
index c1474c8bc..ed58899ca 100644
--- a/libglusterfs/src/event-epoll.c
+++ b/libglusterfs/src/event-epoll.c
@@ -17,7 +17,7 @@
 #include <string.h>
 
 #include "logging.h"
-#include "event.h"
+#include "gf-event.h"
 #include "mem-pool.h"
 #include "common-utils.h"
 #include "syscall.h"
diff --git a/libglusterfs/src/event-poll.c b/libglusterfs/src/event-poll.c
index da69866fb..797649f11 100644
--- a/libglusterfs/src/event-poll.c
+++ b/libglusterfs/src/event-poll.c
@@ -17,7 +17,7 @@
 #include <string.h>
 
 #include "logging.h"
-#include "event.h"
+#include "gf-event.h"
 #include "mem-pool.h"
 #include "common-utils.h"
 #include "syscall.h"
diff --git a/libglusterfs/src/event.c b/libglusterfs/src/event.c
index 6562d86a9..61006c100 100644
--- a/libglusterfs/src/event.c
+++ b/libglusterfs/src/event.c
@@ -17,7 +17,7 @@
 #include <string.h>
 
 #include "logging.h"
-#include "event.h"
+#include "gf-event.h"
 #include "mem-pool.h"
 #include "common-utils.h"
 #include "libglusterfs-messages.h"
diff --git a/libglusterfs/src/event.h b/libglusterfs/src/gf-event.h
similarity index 98%
rename from libglusterfs/src/event.h
rename to libglusterfs/src/gf-event.h
index c60b14ad0..55a74ed17 100644
--- a/libglusterfs/src/event.h
+++ b/libglusterfs/src/gf-event.h
@@ -8,8 +8,8 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _EVENT_H_
-#define _EVENT_H_
+#ifndef _GF_EVENT_H_
+#define _GF_EVENT_H_
 
 #include <pthread.h>
 
@@ -116,4 +116,4 @@ int event_pool_destroy (struct event_pool *event_pool);
 int event_dispatch_destroy (struct event_pool *event_pool);
 int event_handled (struct event_pool *event_pool, int fd, int idx, int gen);
 
-#endif /* _EVENT_H_ */
+#endif /* _GF_EVENT_H_ */
diff --git a/rpc/rpc-lib/src/autoscale-threads.c b/rpc/rpc-lib/src/autoscale-threads.c
index 33ba58c49..4840fd4e9 100644
--- a/rpc/rpc-lib/src/autoscale-threads.c
+++ b/rpc/rpc-lib/src/autoscale-threads.c
@@ -8,7 +8,7 @@
    cases as published by the Free Software Foundation.
 */
 
-#include "event.h"
+#include "gf-event.h"
 #include "rpcsvc.h"
 
 void
diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h
index 7ed0dca2a..c6efa4f53 100644
--- a/rpc/rpc-lib/src/rpcsvc.h
+++ b/rpc/rpc-lib/src/rpcsvc.h
@@ -11,7 +11,7 @@
 #ifndef _RPCSVC_H
 #define _RPCSVC_H
 
-#include "event.h"
+#include "gf-event.h"
 #include "rpc-transport.h"
 #include "logging.h"
 #include "dict.h"
diff --git a/rpc/rpc-transport/rdma/src/rdma.h b/rpc/rpc-transport/rdma/src/rdma.h
index 7ca0ead1f..39f7f4504 100644
--- a/rpc/rpc-transport/rdma/src/rdma.h
+++ b/rpc/rpc-transport/rdma/src/rdma.h
@@ -19,7 +19,7 @@
 #include "rpc-clnt.h"
 #include "rpc-transport.h"
 #include "xlator.h"
-#include "event.h"
+#include "gf-event.h"
 #include <stdio.h>
 #include <list.h>
 #include <arpa/inet.h>
diff --git a/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h
index fdfc20774..4e65489f9 100644
--- a/rpc/rpc-transport/socket/src/socket.h
+++ b/rpc/rpc-transport/socket/src/socket.h
@@ -21,7 +21,7 @@
 #include <openssl/ecdh.h>
 #endif
 
-#include "event.h"
+#include "gf-event.h"
 #include "rpc-transport.h"
 #include "logging.h"
 #include "dict.h"
diff --git a/xlators/features/changelog/src/changelog-rpc-common.h b/xlators/features/changelog/src/changelog-rpc-common.h
index 95c850c94..1a6305369 100644
--- a/xlators/features/changelog/src/changelog-rpc-common.h
+++ b/xlators/features/changelog/src/changelog-rpc-common.h
@@ -13,7 +13,7 @@
 
 #include "rpcsvc.h"
 #include "rpc-clnt.h"
-#include "event.h"
+#include "gf-event.h"
 #include "call-stub.h"
 
 #include "changelog-xdr.h"
diff --git a/xlators/features/quota/src/quota.h b/xlators/features/quota/src/quota.h
index b99ca820e..9fe0e3e0a 100644
--- a/xlators/features/quota/src/quota.h
+++ b/xlators/features/quota/src/quota.h
@@ -19,7 +19,7 @@
 #include "compat.h"
 #include "logging.h"
 #include "dict.h"
-#include "event.h"
+#include "gf-event.h"
 #include "rpcsvc.h"
 #include "rpc-clnt.h"
 #include "byte-order.h"
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index bc1322573..cd30ed963 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -15,7 +15,7 @@
 #include "glusterfs.h"
 #include "statedump.h"
 #include "compat-errno.h"
-#include "event.h"
+#include "gf-event.h"
 
 #include "xdr-rpc.h"
 #include "glusterfs3.h"
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index e4a5bdac1..8ff51a1c1 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -20,7 +20,7 @@
 #include "statedump.h"
 #include "defaults.h"
 #include "authenticate.h"
-#include "event.h"
+#include "gf-event.h"
 #include "events.h"
 #include "server-messages.h"
 #include "rpc-clnt.h"