diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
index 0cd9a2f2f..7694ee279 100644
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -19,7 +19,6 @@
 #include "dev-cache.h"
 #include "dev-type.h"
 
-#include <stdio.h>
 #include <limits.h>
 
 /*
diff --git a/lib/config/config.h b/lib/config/config.h
index a61d28513..b258d557d 100644
--- a/lib/config/config.h
+++ b/lib/config/config.h
@@ -16,8 +16,7 @@
 #ifndef _LVM_CONFIG_H
 #define _LVM_CONFIG_H
 
-#include "lvm-types.h"
-#include "defaults.h"
+#include "libdevmapper.h"
 
 /* 16 bits: 3 bits for major, 4 bits for minor, 9 bits for patchlevel */
 /* FIXME Max LVM version supported: 7.15.511. Extend bits when needed. */
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index 932ba2e26..379223834 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -65,6 +65,7 @@
  *			that parent nodes are consistent with versioning, no check done
  *			if parent node is older or the same age as any child node!)
  */
+#include "defaults.h"
 
 cfg_section(root_CFG_SECTION, "(root)", root_CFG_SECTION, 0, vsn(0, 0, 0), NULL)
 
diff --git a/lib/datastruct/lvm-types.h b/lib/datastruct/lvm-types.h
index de144bd94..b38798f1e 100644
--- a/lib/datastruct/lvm-types.h
+++ b/lib/datastruct/lvm-types.h
@@ -16,9 +16,6 @@
 #ifndef _LVM_TYPES_H
 #define _LVM_TYPES_H
 
-#include <sys/types.h>
-#include <inttypes.h>
-
 #include "libdevmapper.h"
 
 struct str_list {
diff --git a/lib/format_text/import-export.h b/lib/format_text/import-export.h
index 6a4afed78..d4e25f0e7 100644
--- a/lib/format_text/import-export.h
+++ b/lib/format_text/import-export.h
@@ -17,7 +17,6 @@
 #define _LVM_TEXT_IMPORT_EXPORT_H
 
 #include "config.h"
-#include "lvm-types.h"
 #include "metadata.h"
 
 #include <stdio.h>
diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c
index e35a372eb..afb047e86 100644
--- a/lib/mirror/mirrored.c
+++ b/lib/mirror/mirrored.c
@@ -21,7 +21,6 @@
 #include "text_export.h"
 #include "text_import.h"
 #include "config.h"
-#include "defaults.h"
 #include "lvm-string.h"
 #include "targets.h"
 #include "activate.h"
diff --git a/lib/misc/lib.h b/lib/misc/lib.h
index f0dba251e..5bd968a68 100644
--- a/lib/misc/lib.h
+++ b/lib/misc/lib.h
@@ -43,11 +43,6 @@
 #  include "lvm-types.h"
 #endif
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
-#include <sys/stat.h>
 
 #endif
diff --git a/lib/misc/lvm-string.h b/lib/misc/lvm-string.h
index 82ebb128a..a4f112f89 100644
--- a/lib/misc/lvm-string.h
+++ b/lib/misc/lvm-string.h
@@ -16,12 +16,12 @@
 #ifndef _LVM_STRING_H
 #define _LVM_STRING_H
 
-#include <stdio.h>
-#include <stdarg.h>
-
 #define NAME_LEN 128
 #define UUID_PREFIX "LVM-"
 
+#include <sys/types.h>
+
+struct dm_pool;
 struct pool;
 struct logical_volume;
 
diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index 0869ff4d8..815c6f7ae 100644
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -13,7 +13,6 @@
  */
 
 #include "lib.h"
-#include "toolcontext.h"
 #include "segtype.h"
 #include "display.h"
 #include "text_export.h"
@@ -25,7 +24,6 @@
 #include "activate.h"
 #include "metadata.h"
 #include "lv_alloc.h"
-#include "defaults.h"
 
 static const char *_raid_name(const struct lv_segment *seg)
 {
diff --git a/lib/report/properties.c b/lib/report/properties.c
index 8c48de12b..c6ccb7203 100644
--- a/lib/report/properties.c
+++ b/lib/report/properties.c
@@ -15,7 +15,6 @@
 #include "lib.h"
 #include "properties.h"
 #include "activate.h"
-#include "lvm-types.h"
 #include "metadata.h"
 
 
diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c
index 64919b0f3..7ee0365b7 100644
--- a/lib/snapshot/snapshot.c
+++ b/lib/snapshot/snapshot.c
@@ -14,14 +14,12 @@
  */
 
 #include "lib.h"
-#include "toolcontext.h"
 #include "metadata.h"
 #include "segtype.h"
 #include "text_export.h"
 #include "config.h"
 #include "activate.h"
 #include "str_list.h"
-#include "defaults.h"
 
 #define SEG_LOG_ERROR(t, p...) \
 	log_error(t " segment %s of logical volume %s.", ## p, \
diff --git a/lib/thin/thin.c b/lib/thin/thin.c
index d4bde8b7b..b71760307 100644
--- a/lib/thin/thin.c
+++ b/lib/thin/thin.c
@@ -13,18 +13,12 @@
  */
 
 #include "lib.h"
-#include "toolcontext.h"
 #include "metadata.h"
 #include "segtype.h"
 #include "text_export.h"
 #include "config.h"
 #include "activate.h"
 #include "str_list.h"
-#include "defaults.h"
-
-#ifdef DMEVENTD
-#  include "libdevmapper-event.h"
-#endif
 
 /* Dm kernel module name for thin provisiong */
 static const char _thin_pool_module[] = "thin-pool";
diff --git a/lib/unknown/unknown.c b/lib/unknown/unknown.c
index 848a3694e..9e433cffa 100644
--- a/lib/unknown/unknown.c
+++ b/lib/unknown/unknown.c
@@ -15,10 +15,8 @@
 #include "lib.h"
 #include "toolcontext.h"
 #include "segtype.h"
-#include "display.h"
 #include "text_export.h"
 #include "config.h"
-#include "activate.h"
 
 static const char *_unknown_name(const struct lv_segment *seg)
 {
diff --git a/lib/zero/zero.c b/lib/zero/zero.c
index 473daa046..555c57029 100644
--- a/lib/zero/zero.c
+++ b/lib/zero/zero.c
@@ -13,7 +13,6 @@
  */
 
 #include "lib.h"
-#include "toolcontext.h"
 #include "segtype.h"
 #include "display.h"
 #include "config.h"