From 40c44db7205db5f2dd4799cdbbfece96d58e4a6c Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Thu, 14 Nov 2002 14:44:42 +0000
Subject: [PATCH] Fix includes after DM_DIR definition move.

---
 libdm/ioctl/libdm-targets.h | 7 +++++++
 libdm/libdm-common.c        | 7 +++----
 libdm/libdm-common.h.in     | 4 ++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libdm/ioctl/libdm-targets.h b/libdm/ioctl/libdm-targets.h
index b8d21a8cc..6e5838d7e 100644
--- a/libdm/ioctl/libdm-targets.h
+++ b/libdm/ioctl/libdm-targets.h
@@ -4,6 +4,11 @@
  * This file is released under the LGPL.
  */
 
+#ifndef LIB_DMTARGETS_H
+#define LIB_DMTARGETS_H
+
+#include "libdevmapper.h"
+
 struct target {
 	uint64_t start;
 	uint64_t length;
@@ -27,3 +32,5 @@ struct dm_task {
 	char *uuid;
 };
 
+#endif
+
diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index 00879fe99..430efb0bb 100644
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -4,6 +4,8 @@
  * This file is released under the LGPL.
  */
 
+#include "libdm-targets.h"
+#include "libdm-common.h"
 #include "libdevmapper.h"
 
 #include <stdio.h>
@@ -17,10 +19,7 @@
 #include <sys/types.h>
 #include <errno.h>
 #include <linux/kdev_t.h>
-#include <linux/device-mapper.h>
-
-#include "libdm-targets.h"
-#include "libdm-common.h"
+#include <linux/dm-ioctl.h>
 
 #define DEV_DIR "/dev/"
 
diff --git a/libdm/libdm-common.h.in b/libdm/libdm-common.h.in
index f50c2d00b..5427e7aa9 100644
--- a/libdm/libdm-common.h.in
+++ b/libdm/libdm-common.h.in
@@ -4,6 +4,9 @@
  * This file is released under the LGPL.
  */
 
+#ifndef LIB_DMCOMMON_H
+#define LIB_DMCOMMON_H
+
 #define _LOG_DEBUG 7
 #define _LOG_INFO 6
 #define _LOG_NOTICE 5
@@ -29,3 +32,4 @@ int rename_dev_node(const char *old_name, const char *new_name);
 
 #define DM_LIB_VERSION @DM_LIB_VERSION@
 
+#endif