cleanup: use system uuid.h headers

Another bunch of support pulled in from the xfs headers, but would
never have worked correctly on any platform other than Linux as dump
doe snot use the abstractions that xfsprogs wraps around the uuid
interfaces. Hence just make it work on Linux for now, as it's
already relying on native support.

Signed-off-by: Dave Chinner <dchinner@redhat.com>

19 files changed, 19 insertions, 0 deletions

diff --git a/common/fs.c b/common/fs.c
index 184f08d4..e600e382 100644
--- a/common/fs.c
+++ b/common/fs.c
@@ -30,6 +30,7 @@
 #include <sys/ioctl.h>
 #include <assert.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "config.h"
 
diff --git a/common/global.c b/common/global.c
index ea7ad6d1..ca113687 100644
--- a/common/global.c
+++ b/common/global.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "config.h"
 
diff --git a/common/inventory.c b/common/inventory.c
index 83e1ebb8..d1b810c5 100644
--- a/common/inventory.c
+++ b/common/inventory.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <assert.h>
+#include <uuid/uuid.h>
 
 #include "types.h"
 #include "inventory_priv.h"
diff --git a/dump/content.c b/dump/content.c
index fcd7dd7d..15fb357a 100644
--- a/dump/content.c
+++ b/dump/content.c
@@ -34,6 +34,7 @@
 #include <malloc.h>
 #include <assert.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #ifdef linux
 #include <xfs/xqm.h>
diff --git a/dump/var.c b/dump/var.c
index d3fa3be8..6dd6a703 100644
--- a/dump/var.c
+++ b/dump/var.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <dirent.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "config.h"
 
diff --git a/inventory/inv_api.c b/inventory/inv_api.c
index 888c4252..acca40b0 100644
--- a/inventory/inv_api.c
+++ b/inventory/inv_api.c
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <assert.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "config.h"
 
diff --git a/inventory/inv_fstab.c b/inventory/inv_fstab.c
index 1c2bf3d7..56d6b8f2 100644
--- a/inventory/inv_fstab.c
+++ b/inventory/inv_fstab.c
@@ -29,6 +29,7 @@
 #include <sys/dir.h>
 #include <assert.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "config.h"
 
diff --git a/inventory/inv_mgr.c b/inventory/inv_mgr.c
index e521f242..79d4bb10 100644
--- a/inventory/inv_mgr.c
+++ b/inventory/inv_mgr.c
@@ -27,6 +27,7 @@
 #include <sys/dir.h>
 #include <assert.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "config.h"
 
diff --git a/inventory/inv_stobj.c b/inventory/inv_stobj.c
index 0763d0b1..96194767 100644
--- a/inventory/inv_stobj.c
+++ b/inventory/inv_stobj.c
@@ -30,6 +30,7 @@
 #include <sys/mman.h>
 #include <assert.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "config.h"
 
diff --git a/inventory/testmain.c b/inventory/testmain.c
index 3f742e4e..ecddf54c 100644
--- a/inventory/testmain.c
+++ b/inventory/testmain.c
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <assert.h>
+#include <uuid/uuid.h>
 
 #include "config.h"
 
diff --git a/invutil/cmenu.c b/invutil/cmenu.c
index ce23d285..e60fd22f 100644
--- a/invutil/cmenu.c
+++ b/invutil/cmenu.c
@@ -25,6 +25,7 @@
 #include <signal.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "types.h"
 #include "mlog.h"
diff --git a/invutil/fstab.c b/invutil/fstab.c
index ac8f7751..4284cd10 100644
--- a/invutil/fstab.c
+++ b/invutil/fstab.c
@@ -25,6 +25,7 @@
 #include <ncurses.h>
 #include <sys/mman.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "types.h"
 #include "mlog.h"
diff --git a/invutil/invidx.c b/invutil/invidx.c
index 44c5e7fa..67efdf70 100644
--- a/invutil/invidx.c
+++ b/invutil/invidx.c
@@ -26,6 +26,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "types.h"
 #include "mlog.h"
diff --git a/invutil/invutil.c b/invutil/invutil.c
index e1c88687..06bdeda9 100644
--- a/invutil/invutil.c
+++ b/invutil/invutil.c
@@ -28,6 +28,7 @@
 #include <sys/mman.h>
 #include <string.h>
 #include <libgen.h>
+#include <uuid/uuid.h>
 
 #include "types.h"
 #include "mlog.h"
diff --git a/invutil/list.c b/invutil/list.c
index 0157102c..ae5d9b78 100644
--- a/invutil/list.c
+++ b/invutil/list.c
@@ -19,6 +19,7 @@
 #include <xfs/xfs.h>
 #include <xfs/jdm.h>
 #include <ncurses.h>
+#include <uuid/uuid.h>
 
 #include "list.h"
 #include "cmenu.h"
diff --git a/invutil/menu.c b/invutil/menu.c
index a0d2d0ee..c050359f 100644
--- a/invutil/menu.c
+++ b/invutil/menu.c
@@ -20,6 +20,7 @@
 #include <xfs/jdm.h>
 #include <ncurses.h>
 #include <ctype.h>
+#include <uuid/uuid.h>
 
 #include "types.h"
 #include "cmenu.h"
diff --git a/invutil/screen.c b/invutil/screen.c
index c4b79d89..6e913a78 100644
--- a/invutil/screen.c
+++ b/invutil/screen.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ncurses.h>
+#include <uuid/uuid.h>
 
 #include "cmenu.h"
 
diff --git a/invutil/stobj.c b/invutil/stobj.c
index eb04385d..f389c531 100644
--- a/invutil/stobj.c
+++ b/invutil/stobj.c
@@ -25,6 +25,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "types.h"
 #include "mlog.h"
diff --git a/restore/content.c b/restore/content.c
index 5e6e88e3..d4fe3504 100644
--- a/restore/content.c
+++ b/restore/content.c
@@ -38,6 +38,7 @@
 #include <pthread.h>
 #include <assert.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include "config.h"