cleanup: headers self compilable

In most cases header should be self-compilable, so the
do not expect other 'header' files to be used upfront
so the header would be compilable.

No functional change.

daemons/cmirrord/compat.h

@@ -8,6 +8,8 @@
 #ifndef _LVM_CLOG_COMPAT_H
 #define _LVM_CLOG_COMPAT_H
 
+#include <stddef.h>
+
 /*
  * The intermachine communication structure version are:
  *	0: Unused
@@ -19,6 +21,8 @@
  */
 #define CLOG_TFR_VERSION 5
 
+struct clog_request;
+
 int clog_request_to_network(struct clog_request *rq);
 int clog_request_from_network(void *data, size_t data_len);
 

daemons/cmirrord/local.h

@@ -12,6 +12,8 @@
 #ifndef _LVM_CLOG_LOCAL_H
 #define _LVM_CLOG_LOCAL_H
 
+struct dm_ulog_request;
+
 int init_local(void);
 void cleanup_local(void);
 

daemons/dmeventd/dmeventd.h

@@ -15,6 +15,8 @@
 #ifndef __DMEVENTD_DOT_H__
 #define __DMEVENTD_DOT_H__
 
+#include <stdint.h>
+
 /* FIXME This stuff must be configurable. */
 
 #define	DM_EVENT_FIFO_CLIENT	DEFAULT_DM_RUN_DIR "/dmeventd-client"

daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h

@@ -25,6 +25,8 @@
 #ifndef _DMEVENTD_LVMWRAP_H
 #define _DMEVENTD_LVMWRAP_H
 
+#include <stddef.h>
+
 struct dm_pool;
 
 int dmeventd_lvm2_init(void);

daemons/lvmlockd/lvmlockd-internal.h

@@ -13,6 +13,9 @@
 
 #include "base/memory/container_of.h"
 
+#include <stdint.h>
+#include <pthread.h>
+
 #define MAX_NAME 64
 #define MAX_ARGS 64
 

daemons/lvmpolld/lvmpolld-data-utils.h

@@ -15,7 +15,10 @@
 #ifndef _LVM_LVMPOLLD_DATA_UTILS_H
 #define _LVM_LVMPOLLD_DATA_UTILS_H
 
+#include "base/data-struct/hash.h"
+
 #include <pthread.h>
+#include <stdio.h>
 
 struct buffer;
 struct lvmpolld_state;

device_mapper/ioctl/libdm-targets.h

@@ -16,6 +16,8 @@
 #ifndef LIB_DMTARGETS_H
 #define LIB_DMTARGETS_H
 
+#include "device_mapper/all.h"
+
 #include <inttypes.h>
 #include <sys/types.h>
 

device_mapper/misc/dm-ioctl.h

@@ -13,6 +13,8 @@
 #  include <linux/types.h>
 #endif
 
+#include <stdint.h>
+
 #define DM_DIR "mapper"		/* Slashes not supported */
 #define DM_CONTROL_NODE "control"
 #define DM_MAX_TYPE_NAME 16

device_mapper/regex/parse_rx.c

@@ -13,7 +13,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "device_mapper/misc/dmlib.h"
 #include "parse_rx.h"
 
 #ifdef DEBUG

device_mapper/regex/parse_rx.h

@@ -16,6 +16,8 @@
 #ifndef _DM_PARSE_REGEX_H
 #define _DM_PARSE_REGEX_H
 
+#include "device_mapper/misc/dmlib.h"
+
 enum {
 	CAT,
 	STAR,

device_mapper/regex/ttree.c

@@ -13,7 +13,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "device_mapper/misc/dmlib.h"
 #include "ttree.h"
 
 struct node {

device_mapper/regex/ttree.h

@@ -16,6 +16,8 @@
 #ifndef _DM_TTREE_H
 #define _DM_TTREE_H
 
+#include "device_mapper/misc/dmlib.h"
+
 struct ttree;
 
 struct ttree *ttree_create(struct dm_pool *mem, unsigned int klen);

lib/activate/targets.h

@@ -16,8 +16,12 @@
 #ifndef _LVM_TARGETS_H
 #define _LVM_TARGETS_H
 
+#include <stddef.h>
+#include <stdint.h>
+
 struct dev_manager;
 struct lv_segment;
+struct dm_tree_node;
 
 int compose_areas_line(struct dev_manager *dm, struct lv_segment *seg,
 		       char *params, size_t paramsize, int *pos,

lib/commands/cmd_enum.h

@@ -12,7 +12,7 @@
 
 enum {
 #define cmd(a, b) a ,
-#include "cmds.h"
+#include "include/cmds.h"
 #undef cmd
 };
 

lib/commands/toolcontext.h

@@ -19,6 +19,8 @@
 #include "lib/device/dev-cache.h"
 #include "lib/device/dev-type.h"
 #include "lib/commands/cmd_enum.h"
+#include "lib/log/lvm-logging.h"
+#include "lib/misc/lvm-string.h"
 
 #include <limits.h>
 

lib/datastruct/btree.h

@@ -16,7 +16,10 @@
 #ifndef _LVM_BTREE_H
 #define _LVM_BTREE_H
 
+#include <stdint.h>
+
 struct btree;
+struct dm_pool;
 
 struct btree *btree_create(struct dm_pool *mem);
 

lib/device/dev-type.c

@@ -16,6 +16,7 @@
 #include "lib/misc/lib.h"
 #include "lib/device/dev-type.h"
 #include "lib/device/device-types.h"
+#include "lib/device/filesystem.h"
 #include "lib/mm/xlate.h"
 #include "lib/config/config.h"
 #include "lib/metadata/metadata.h"
@@ -23,6 +24,7 @@
 #include "lib/label/label.h"
 #include "lib/commands/toolcontext.h"
 #include "lib/activate/activate.h"
+#include "lib/display/display.h"
 #include "device_mapper/misc/dm-ioctl.h"
 
 #ifdef BLKID_WIPING_SUPPORT

lib/device/dev-type.h

@@ -16,9 +16,10 @@
 #define _LVM_DEV_TYPE_H
 
 #include "lib/device/device.h"
-#include "lib/display/display.h"
+#include "lib/metadata/metadata-exported.h"
 #include "lib/label/label.h"
-#include "lib/device/filesystem.h"
+
+struct fs_info;
 
 #define NUMBER_OF_MAJORS 4096
 

lib/device/device-types.h

@@ -13,6 +13,11 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef LIB_DEVICE_DEVICE_TYPES_H
+#define LIB_DEVICE_DEVICE_TYPES_H
+
+#include <stdint.h>
+
 typedef struct {
 	const char name[15];
 	const int8_t max_partitions;
@@ -67,3 +72,5 @@ static const dev_known_type_t _dev_known_types[] = {
 	{"VxDMP", 16, "Veritas Dynamic Multipathing"},
 	{"", 0, ""}
 };
+
+#endif

lib/device/device.h

@@ -16,8 +16,10 @@
 #ifndef _LVM_DEVICE_H
 #define _LVM_DEVICE_H
 
+#include "base/data-struct/list.h"
 #include "lib/uuid/uuid.h"
 
+#include <stdint.h>
 #include <fcntl.h>
 
 #define DEV_REGULAR		0x00000002	/* Regular file? */

lib/device/device_id.c

@@ -14,8 +14,6 @@
 
 #include "base/memory/zalloc.h"
 #include "lib/misc/lib.h"
-#include "lib/commands/toolcontext.h"
-#include "lib/device/device.h"
 #include "lib/device/device_id.h"
 #include "lib/device/dev-type.h"
 #include "lib/label/label.h"
@@ -26,6 +24,7 @@
 #include "lib/datastruct/str_list.h"
 #include "lib/metadata/metadata-exported.h"
 #include "lib/activate/activate.h"
+#include "lib/display/display.h"
 #include "device_mapper/misc/dm-ioctl.h"
 
 #include <sys/stat.h>

lib/device/device_id.h

@@ -16,6 +16,9 @@
 #ifndef _LVM_DEVICE_ID_H
 #define _LVM_DEVICE_ID_H
 
+#include "lib/commands/toolcontext.h"
+#include "lib/device/device.h"
+
 void free_du(struct dev_use *du);
 void free_dus(struct dm_list *dus);
 void free_did(struct dev_id *did);

lib/device/filesystem.c

@@ -14,9 +14,9 @@
 
 #include "base/memory/zalloc.h"
 #include "lib/misc/lib.h"
-#include "lib/commands/toolcontext.h"
-#include "lib/device/device.h"
 #include "lib/device/dev-type.h"
+#include "lib/device/filesystem.h"
+#include "lib/display/display.h"
 #include "lib/misc/lvm-exec.h"
 #include "lib/activate/dev_manager.h"
 

lib/device/filesystem.h

@@ -15,6 +15,9 @@
 #ifndef _FILESYSTEM_H
 #define _FILESYSTEM_H
 
+#include "lib/commands/toolcontext.h"
+#include "lib/device/device.h"
+
 #define FSTYPE_MAX 16
 
 struct fs_info {

lib/device/online.c

@@ -14,9 +14,8 @@
 
 #include "base/memory/zalloc.h"
 #include "lib/misc/lib.h"
-#include "lib/commands/toolcontext.h"
-#include "lib/device/device.h"
 #include "lib/device/online.h"
+#include "lib/config/defaults.h"
 
 #include <dirent.h>
 

lib/device/online.h

@@ -15,6 +15,9 @@
 #ifndef _ONLINE_H
 #define _ONLINE_H
 
+#include "lib/commands/toolcontext.h"
+#include "lib/device/device.h"
+
 struct pv_online {
 	struct dm_list list;
 	struct device *dev;

lib/filters/filter-persistent.c

@@ -17,7 +17,6 @@
 #include "base/data-struct/radix-tree.h"
 #include "lib/misc/lib.h"
 #include "lib/filters/filter.h"
-#include "lib/config/config.h"
 
 struct pfilter {
 	struct radix_tree *devices;

lib/filters/filter-usable.c

@@ -15,6 +15,7 @@
 #include "base/memory/zalloc.h"
 #include "lib/misc/lib.h"
 #include "lib/filters/filter.h"
+#include "lib/config/config.h"
 #include "lib/activate/activate.h"
 
 static const char _too_small_to_hold_pv_msg[] = "Too small to hold a PV";

lib/format_text/text_export.h

@@ -16,6 +16,8 @@
 #ifndef _LVM_TEXT_EXPORT_H
 #define _LVM_TEXT_EXPORT_H
 
+#include <stdint.h>
+
 #define outsize(args...) do {if (!out_size(args)) return_0;} while (0)
 #define outhint(args...) do {if (!out_hint(args)) return_0;} while (0)
 #define outfc(args...) do {if (!out_text_with_comment(args)) return_0;} while (0)

lib/format_text/text_import.h

@@ -21,6 +21,7 @@
 struct dm_hash_table;
 struct lv_segment;
 struct dm_config_node;
+struct dm_config_value;
 
 int text_import_areas(struct lv_segment *seg, const struct dm_config_node *sn,
 		      const struct dm_config_value *cv, uint64_t status);

lib/label/hints.c

@@ -141,7 +141,6 @@
 #include "lib/misc/crc.h"
 #include "lib/cache/lvmcache.h"
 #include "lib/device/bcache.h"
-#include "lib/commands/toolcontext.h"
 #include "lib/activate/activate.h"
 #include "lib/label/hints.h"
 #include "lib/device/dev-type.h"

lib/label/hints.h

@@ -15,6 +15,8 @@
 #ifndef _LVM_HINTS_H
 #define _LVM_HINTS_H
 
+#include "lib/commands/toolcontext.h"
+
 struct hint {
 	struct dm_list list;
 	dev_t devt;

lib/locking/locking.c

@@ -23,6 +23,7 @@
 #include "lib/mm/memlock.h"
 #include "lib/config/defaults.h"
 #include "lib/cache/lvmcache.h"
+#include "lib/display/display.h"
 #include "lib/misc/lvm-signal.h"
 
 #include <assert.h>

lib/locking/lvmlockd.c

@@ -15,6 +15,7 @@
 #include "lib/activate/activate.h"
 #include "lib/locking/lvmlockd.h"
 #include "lib/cache/lvmcache.h"
+#include "lib/display/display.h"
 #include "daemons/lvmlockd/lvmlockd-client.h"
 
 #include <mntent.h>

lib/log/lvm-logging.h

@@ -18,6 +18,8 @@
 
 #include "lib/misc/lvm-file.h"
 
+#include <stdint.h>
+
 __attribute__ ((format(printf, 5, 6)))
 void print_log(int level, const char *file, int line, int dm_errno_or_class,
 	       const char *format, ...);

lib/metadata/merge.c

@@ -20,6 +20,7 @@
 #include "lib/metadata/pv_alloc.h"
 #include "lib/datastruct/str_list.h"
 #include "lib/metadata/segtype.h"
+#include "lib/display/display.h"
 
 /*
  * Attempt to merge two adjacent segments.

lib/metadata/snapshot_manip.c

@@ -20,6 +20,7 @@
 #include "lib/commands/toolcontext.h"
 #include "lib/metadata/lv_alloc.h"
 #include "lib/activate/activate.h"
+#include "lib/display/display.h"
 
 #define SNAPSHOT_MIN_CHUNKS	3       /* Minimum number of chunks in snapshot */
 

lib/misc/lvm-file.c

@@ -17,7 +17,6 @@
 #include "lib/misc/lvm-file.h"
 
 #include <unistd.h>
-#include <sys/stat.h>
 #include <sys/file.h>
 #include <fcntl.h>
 #include <dirent.h>

lib/misc/lvm-file.h

@@ -16,6 +16,11 @@
 #ifndef _LVM_FILE_H
 #define _LVM_FILE_H
 
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <sys/stat.h>
+
 struct custom_fds {
 	int out;
 	int err;

lib/misc/lvm-flock.h

@@ -15,6 +15,10 @@
 #ifndef _LVM_FLOCK_H
 #define _LVM_FLOCK_H
 
+#include <stdint.h>
+
+struct cmd_context;
+
 void init_flock(struct cmd_context *cmd);
 int lock_file(const char *file, uint32_t flags);
 void release_flocks(int unlock);

lib/misc/lvm-globals.c

@@ -15,9 +15,7 @@
 
 #include "lib/misc/lib.h"
 #include "lib/device/device.h"
-#include "lib/misc/lvm-string.h"
 #include "lib/config/defaults.h"
-#include "lib/metadata/metadata-exported.h"
 
 #include <stdarg.h>
 

lib/misc/lvm-globals.h

@@ -16,6 +16,8 @@
 #ifndef _LVM_GLOBALS_H
 #define _LVM_GLOBALS_H
 
+#include <stdint.h>
+
 #define VERBOSE_BASE_LEVEL _LOG_WARN
 #define SECURITY_LEVEL 0
 #define PV_MIN_SIZE_KB 512

lib/misc/lvm-signal.h

@@ -16,6 +16,7 @@
 #ifndef _LVM_SIGNAL_H
 #define _LVM_SIGNAL_H
 
+#include <stdint.h>
 #include <unistd.h>
 
 void remove_ctrl_c_handler(void);

lib/misc/lvm-wrappers.h

@@ -16,6 +16,8 @@
 #ifndef _LVM_WRAPPERS_H
 #define _LVM_WRAPPERS_H
 
+#include <stddef.h>
+
 int udev_init_library_context(void);
 void *udev_get_library_context(void);
 void udev_fin_library_context(void);

lib/misc/util.h

@@ -15,7 +15,7 @@
 #ifndef _LVM_UTIL_H
 #define _LVM_UTIL_H
 
-#include <inttypes.h>
+#include "device_mapper/all.h"
 
 #define min(a, b) ({ __typeof__(a) _a = (a); \
 		     __typeof__(b) _b = (b); \

lib/notify/lvmnotify.h

@@ -11,6 +11,8 @@
 #ifndef _LVMNOTIFY_H
 #define _LVMNOTIFY_H
 
+struct cmd_context;
+
 int lvmnotify_is_supported(void);
 void lvmnotify_send(struct cmd_context *cmd);
 void set_vg_notify(struct cmd_context *cmd);

lib/unknown/unknown.c

@@ -17,7 +17,6 @@
 #include "lib/commands/toolcontext.h"
 #include "lib/metadata/segtype.h"
 #include "lib/format_text/text_export.h"
-#include "lib/config/config.h"
 
 static int _unknown_text_import(struct lv_segment *seg, const struct dm_config_node *sn)
 {

libdaemon/client/config-util.h

@@ -15,6 +15,11 @@
 #ifndef _LVM_DAEMON_CONFIG_UTIL_H
 #define _LVM_DAEMON_CONFIG_UTIL_H
 
+#include "device_mapper/all.h"
+
+#include <stdarg.h>
+#include <stdint.h>
+
 struct buffer {
 	int allocated;
 	int used;

libdaemon/server/daemon-stray.h

@@ -34,6 +34,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <limits.h>
 
 #ifdef HAVE_VALGRIND

libdm/dm-tools/dmsetup.c

@@ -39,7 +39,6 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#include <stdlib.h>
 
 #ifdef UDEV_SYNC_SUPPORT
 #  include <sys/types.h>

libdm/dm-tools/util.h

@@ -15,7 +15,7 @@
 #ifndef _LVM_UTIL_H
 #define _LVM_UTIL_H
 
-#include <inttypes.h>
+#include "libdm/libdevmapper.h"
 
 /* Use wrapper for checked results */
 static inline __attribute__((warn_unused_result))

libdm/ioctl/libdm-targets.h

@@ -16,6 +16,8 @@
 #ifndef LIB_DMTARGETS_H
 #define LIB_DMTARGETS_H
 
+#include "libdm/libdevmapper.h"
+
 #include <inttypes.h>
 #include <sys/types.h>
 

libdm/misc/dm-ioctl.h

@@ -8,6 +8,8 @@
 #ifndef _LINUX_DM_IOCTL_V4_H
 #define _LINUX_DM_IOCTL_V4_H
 
+#include <stdint.h>
+
 #ifdef __linux__
 #  include <linux/types.h>
 #endif

libdm/regex/parse_rx.c

@@ -13,7 +13,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libdm/misc/dmlib.h"
 #include "parse_rx.h"
 
 #ifdef DEBUG

libdm/regex/parse_rx.h

@@ -16,6 +16,8 @@
 #ifndef _DM_PARSE_REGEX_H
 #define _DM_PARSE_REGEX_H
 
+#include "libdm/misc/dmlib.h"
+
 enum {
 	CAT,
 	STAR,

libdm/regex/ttree.h

@@ -17,6 +17,7 @@
 #define _DM_TTREE_H
 
 struct ttree;
+struct dm_pool;
 
 struct ttree *ttree_create(struct dm_pool *mem, unsigned int klen);
 

test/unit/matcher_data.h

@@ -1,3 +1,5 @@
+#include <stddef.h>
+
 struct check_item {
 	const char *str;
 	int expected;

tools/command.c

@@ -74,7 +74,7 @@ static const struct lv_type _lv_types[LVT_COUNT + 1] = {
 
 static const struct cmd_name cmd_names[CMD_COUNT + 1] = {
 #define cmd(a, b) { # b, a },
-#include "../include/cmds.h"
+#include "include/cmds.h"
 #undef cmd
 };
 

tools/command.h

@@ -16,6 +16,8 @@
 #ifndef _LVM_COMMAND_H
 #define _LVM_COMMAND_H
 
+#include <stdint.h>
+
 struct cmd_context;
 struct logical_volume;
 

tools/command_enums.h

@@ -21,6 +21,8 @@
  */
 #include "lib/commands/cmd_enum.h"
 
+struct arg_values;
+
 /* define the enums for the command line --options, foo_ARG */
 enum {
 #define arg(a, b, c, d, e, f, g) a ,

tools/stub.h

@@ -13,6 +13,11 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "lib/log/lvm-logging.h"
+#include "tools/errors.h"
+
+struct cmd_context;
+
 int lvmsadc(struct cmd_context *cmd __attribute__((unused)),
 	    int argc __attribute__((unused)),
 	    char **argv __attribute__((unused)))

tools/tools.h

@@ -16,7 +16,9 @@
 #ifndef _LVM_TOOLS_H
 #define _LVM_TOOLS_H
 
+#include "tools/errors.h"
 #include "tools/tool.h"
+#include "tools/toollib.h"
 
 #include "lib/log/lvm-logging.h"
 
@@ -31,7 +33,6 @@
 #include "lib/device/device.h"
 #include "lib/device/device_id.h"
 #include "lib/display/display.h"
-#include "errors.h"
 #include "lib/metadata/metadata-exported.h"
 #include "lib/locking/locking.h"
 #include "lib/misc/lvm-exec.h"
@@ -41,7 +42,6 @@
 #include "lib/metadata/segtype.h"
 #include "lib/datastruct/str_list.h"
 #include "lib/commands/toolcontext.h"
-#include "toollib.h"
 #include "lib/notify/lvmnotify.h"
 #include "lib/label/hints.h"