Fix compile errors.

3 files changed, 4 insertions, 2 deletions

diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.h b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.h
index 3b749642b1d..9056f437664 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.h
+++ b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.h
@@ -17,6 +17,7 @@
 #include <vespa/filedistribution/common/buffer.h>
 #include <vespa/filedistribution/common/exceptionrethrower.h>
 #include <vespa/filedistribution/common/exception.h>
+#include <vespa/filedistribution/model/filedbmodel.h>
 
 namespace filedistribution {
 
diff --git a/filedistribution/src/vespa/filedistribution/manager/filedb.h b/filedistribution/src/vespa/filedistribution/manager/filedb.h
index f0cac46d80a..6a3e5cb4e91 100644
--- a/filedistribution/src/vespa/filedistribution/manager/filedb.h
+++ b/filedistribution/src/vespa/filedistribution/manager/filedb.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <boost/filesystem/path.hpp>
-#include "filedbmodel.h"
+#include <vespa/filedistribution/model/filedbmodel.h>
 
 namespace filedistribution {
 
diff --git a/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp b/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp
index e823b3300ba..16e55a32d96 100644
--- a/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp
+++ b/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp
@@ -12,6 +12,7 @@
 #include "zkfiledbmodel.h"
 #include "deployedfilestodownload.h"
 #include <vespa/filedistribution/common/logfwd.h>
+#include <sys/file.h>
 
 namespace fs = boost::filesystem;
 
@@ -300,7 +301,7 @@ FileDBModel::~FileDBModel() {}
 DirectoryGuard::DirectoryGuard(boost::filesystem::path path) :
     _fd(-1)
 {
-    _fd = open(path, O_RDONLY);
+    _fd = open(path.c_str(), O_RDONLY);
     assert(_fd != -1);
     int retval = flock(_fd, LOCK_EX);
     assert(retval == 0);