diff --git a/lib/format_text/layout.h b/lib/format_text/layout.h
index 7ec699e84..c3dfe8e7a 100644
--- a/lib/format_text/layout.h
+++ b/lib/format_text/layout.h
@@ -18,11 +18,10 @@
 
 #include "lib/config/config.h"
 #include "lib/metadata/metadata.h"
+#include "lib/format_text/format-text.h"
 #include "lib/cache/lvmcache.h"
 #include "lib/uuid/uuid.h"
 
-/* disk_locn and data_area_list are defined in format-text.h */
-
 /*
  * PV header extension versions:
  *   - version 1: bootloader area support
diff --git a/lib/label/hints.c b/lib/label/hints.c
index f8e8f4520..f1a151943 100644
--- a/lib/label/hints.c
+++ b/lib/label/hints.c
@@ -135,11 +135,10 @@
  *
  */
 
-#include "base/memory/zalloc.h"
 #include "lib/misc/lib.h"
+#include "base/memory/zalloc.h"
 #include "lib/label/label.h"
 #include "lib/misc/crc.h"
-#include "lib/mm/xlate.h"
 #include "lib/cache/lvmcache.h"
 #include "lib/device/bcache.h"
 #include "lib/commands/toolcontext.h"
diff --git a/lib/label/label.c b/lib/label/label.c
index 680630b8e..328e4e75b 100644
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -13,8 +13,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "base/memory/zalloc.h"
 #include "lib/misc/lib.h"
+#include "base/memory/zalloc.h"
 #include "lib/label/label.h"
 #include "lib/misc/crc.h"
 #include "lib/mm/xlate.h"
@@ -24,7 +24,6 @@
 #include "lib/activate/activate.h"
 #include "lib/label/hints.h"
 #include "lib/metadata/metadata.h"
-#include "lib/format_text/format-text.h"
 #include "lib/format_text/layout.h"
 
 #include <sys/stat.h>
diff --git a/lib/metadata/writecache_manip.c b/lib/metadata/writecache_manip.c
index 5a5a7594b..01220256b 100644
--- a/lib/metadata/writecache_manip.c
+++ b/lib/metadata/writecache_manip.c
@@ -21,7 +21,6 @@
 #include "lib/metadata/segtype.h"
 #include "lib/activate/activate.h"
 #include "lib/config/defaults.h"
-#include "lib/activate/dev_manager.h"
 
 int lv_is_writecache_origin(const struct logical_volume *lv)
 {
diff --git a/tools/pvscan.c b/tools/pvscan.c
index 312a6330b..1bf543c1e 100644
--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -20,7 +20,6 @@
 #include "lib/label/hints.h"
 
 #include <dirent.h>
-#include <sys/file.h>
 
 struct pvscan_params {
 	int new_pvs_found;