2 files changed, 3 insertions, 2 deletions
diff --git a/lib/util/debug.h b/lib/util/debug.h
index a5962b04bb..7518a64e19 100644
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -133,6 +133,7 @@ _PUBLIC_ void register_debug_handlers(const char *name, struct debug_ops *ops);
 */
 _PUBLIC_ void dbgtext(const char *format, ...) PRINTF_ATTRIBUTE(1,2);
 
-extern XFILE *dbf;
+struct _XFILE;
+extern struct _XFILE *dbf;
 
 #endif
diff --git a/lib/util/xfile.h b/lib/util/xfile.h
index af90f3f55c..1b15929997 100644
--- a/lib/util/xfile.h
+++ b/lib/util/xfile.h
@@ -23,7 +23,7 @@
   see xfile.c for explanations
 */
 
-typedef struct {
+typedef struct _XFILE {
 	int fd;
 	char *buf;
 	char *next;