diff --git a/lib/Basics/Logger.cpp b/lib/Basics/Logger.cpp
index 032420f0fd..ec7ff0dc88 100644
--- a/lib/Basics/Logger.cpp
+++ b/lib/Basics/Logger.cpp
@@ -33,6 +33,88 @@
 #define prioritynames TRI_prioritynames
 #define facilitynames TRI_facilitynames
 #include <syslog.h>
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief Adopt syslog compfort headers from linux
+////////////////////////////////////////////////////////////////////////////////
+/*
+ * Copyright (c) 1982, 1986, 1988, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      @(#)syslog.h    8.1 (Berkeley) 6/2/93
+ */
+#ifndef CODE
+typedef struct _code {
+const char *c_name;
+int c_val;
+} CODE;
+#endif
+
+#ifndef prioritynames
+CODE prioritynames[] =
+{
+{ "alert", LOG_ALERT },
+{ "crit", LOG_CRIT },
+{ "debug", LOG_DEBUG },
+{ "emerg", LOG_EMERG },
+{ "err", LOG_ERR },
+{ "error", LOG_ERR },
+{ "warning", LOG_WARNING },
+{ NULL, -1 }
+};
+
+#endif
+#ifdef facilitynames
+CODE facilitynames[] =
+  {
+    { "auth", LOG_AUTH },
+    { "authpriv", LOG_AUTHPRIV },
+    { "cron", LOG_CRON },
+    { "daemon", LOG_DAEMON },
+    { "ftp", LOG_FTP },
+    { "kern", LOG_KERN },
+    { "lpr", LOG_LPR },
+    { "mail", LOG_MAIL },
+    { "news", LOG_NEWS },
+    { "syslog", LOG_SYSLOG },
+    { "user", LOG_USER },
+    { "uucp", LOG_UUCP },
+    { "local0", LOG_LOCAL0 },
+    { "local1", LOG_LOCAL1 },
+    { "local2", LOG_LOCAL2 },
+    { "local3", LOG_LOCAL3 },
+    { "local4", LOG_LOCAL4 },
+    { "local5", LOG_LOCAL5 },
+    { "local6", LOG_LOCAL6 },
+    { "local7", LOG_LOCAL7 },
+    { NULL, -1 }
+  };
+#endif
+
 #endif
 
 #include <boost/lockfree/queue.hpp>
diff --git a/lib/Basics/operating-system.h b/lib/Basics/operating-system.h
index 199276bd15..beaa104932 100644
--- a/lib/Basics/operating-system.h
+++ b/lib/Basics/operating-system.h
@@ -68,6 +68,7 @@
 #define TRI_HAVE_UNISTD_H 1
 #define TRI_HAVE_POLL_H 1
 
+#define TRI_HAVE_SYS_FILE_H 1
 #define TRI_HAVE_SYS_IOCTL_H 1
 #define TRI_HAVE_SYS_RESOURCE_H 1
 #define TRI_HAVE_SYS_TIME_H 1