diff --git a/lib/util/xfile.c b/lib/util/xfile.c
index 58a34bf1c34..62dd1213a75 100644
--- a/lib/util/xfile.c
+++ b/lib/util/xfile.c
@@ -35,7 +35,8 @@
 
 #include "replace.h"
 #include "system/filesys.h"
-#include "lib/util/samba_util.h"
+#include "memory.h"
+#include "xfile.h"
 
 #define XBUFSIZE BUFSIZ
 
diff --git a/lib/util/xfile.h b/lib/util/xfile.h
index 1b159299974..f52596dc8a8 100644
--- a/lib/util/xfile.h
+++ b/lib/util/xfile.h
@@ -19,6 +19,12 @@
 
 #ifndef _XFILE_H_
 #define _XFILE_H_
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#include "attr.h"
+
 /*
   see xfile.c for explanations
 */