diff --git a/include/ntfs/device.h b/include/ntfs/device.h
index 4ca66af7..d6080cf8 100644
--- a/include/ntfs/device.h
+++ b/include/ntfs/device.h
@@ -26,8 +26,6 @@
 #include "config.h"
 #endif
 
-#include <sys/stat.h>
-
 #include "device_io.h"
 #include "types.h"
 #include "support.h"
@@ -70,6 +68,8 @@ struct ntfs_device {
 						   device operations. */
 };
 
+struct stat;
+
 /*
  * The ntfs device operations defining all operations that can be performed on
  * the low level device described by a ntfs device structure.
diff --git a/ntfsprogs/cluster.c b/ntfsprogs/cluster.c
index 49a0d6a4..15a7895a 100644
--- a/ntfsprogs/cluster.c
+++ b/ntfsprogs/cluster.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <getopt.h>
 #include <stdlib.h>
 #include <string.h>