libglusterfs: Move devel headers under glusterfs directory

libglusterfs devel package headers are referenced in code using
include semantics for a program, this while it works can be better
especially when dealing with out of tree xlator builds or in
general out of tree devel package usage.

Towards this, the following changes are done,
- moved all devel headers under a glusterfs directory
- Included these headers using system header notation <> in all
code outside of libglusterfs
- Included these headers using own program notation "" within
libglusterfs

This change although big, is just moving around the headers and
making it correct when including these headers from other sources.

This helps us correctly include libglusterfs includes without
namespace conflicts.

Change-Id: Id2a98854e671a7ee5d73be44da5ba1a74252423b
Updates: bz#1193929
Signed-off-by: ShyamsundarR <srangana@redhat.com>

7 files changed, 17 insertions, 17 deletions

diff --git a/libglusterfs/src/gfdb/gfdb_data_store.c b/libglusterfs/src/gfdb/gfdb_data_store.c
index ab56a51d462..02894cf7785 100644
--- a/libglusterfs/src/gfdb/gfdb_data_store.c
+++ b/libglusterfs/src/gfdb/gfdb_data_store.c
@@ -10,8 +10,8 @@
 
 #include "gfdb_sqlite3.h"
 #include "gfdb_data_store.h"
-#include "list.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/list.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 /******************************************************************************
  *
diff --git a/libglusterfs/src/gfdb/gfdb_data_store.h b/libglusterfs/src/gfdb/gfdb_data_store.h
index 59f7bd01ab3..55b2fb1bc55 100644
--- a/libglusterfs/src/gfdb/gfdb_data_store.h
+++ b/libglusterfs/src/gfdb/gfdb_data_store.h
@@ -10,10 +10,10 @@
 #ifndef __GFDB_DATA_STORE_H
 #define __GFDB_DATA_STORE_H
 
-#include "glusterfs.h"
-#include "xlator.h"
-#include "logging.h"
-#include "common-utils.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/xlator.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/common-utils.h"
 #include <time.h>
 #include <sys/time.h>
 
diff --git a/libglusterfs/src/gfdb/gfdb_data_store_helper.c b/libglusterfs/src/gfdb/gfdb_data_store_helper.c
index b1f79bc8dad..5f33312ad9b 100644
--- a/libglusterfs/src/gfdb/gfdb_data_store_helper.c
+++ b/libglusterfs/src/gfdb/gfdb_data_store_helper.c
@@ -1,6 +1,6 @@
 
 #include "gfdb_data_store_helper.h"
-#include "syscall.h"
+#include "glusterfs/syscall.h"
 
 /******************************************************************************
  *
diff --git a/libglusterfs/src/gfdb/gfdb_data_store_helper.h b/libglusterfs/src/gfdb/gfdb_data_store_helper.h
index 7b4b0ae6aa1..3c4499bdd3b 100644
--- a/libglusterfs/src/gfdb/gfdb_data_store_helper.h
+++ b/libglusterfs/src/gfdb/gfdb_data_store_helper.h
@@ -15,12 +15,12 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "common-utils.h"
-#include "compat-uuid.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/compat-uuid.h"
 #include "gfdb_mem-types.h"
-#include "dict.h"
-#include "byte-order.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/dict.h"
+#include "glusterfs/byte-order.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 #define GFDB_DATA_STORE "gfdbdatastore"
 
diff --git a/libglusterfs/src/gfdb/gfdb_mem-types.h b/libglusterfs/src/gfdb/gfdb_mem-types.h
index 0ea543b7ce1..b97cdf89446 100644
--- a/libglusterfs/src/gfdb/gfdb_mem-types.h
+++ b/libglusterfs/src/gfdb/gfdb_mem-types.h
@@ -11,7 +11,7 @@
 #ifndef __GFDB_MEM_TYPES_H__
 #define __GFDB_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include "glusterfs/mem-types.h"
 
 enum gfdb_mem_types_ { gfdb_mtstart = gf_common_mt_end + 1, gfdb_mt_end };
 #endif
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c
index 63957278e8a..98232d5e379 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3.c
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c
@@ -10,8 +10,8 @@
 
 #include "gfdb_sqlite3.h"
 #include "gfdb_sqlite3_helper.h"
-#include "libglusterfs-messages.h"
-#include "syscall.h"
+#include "glusterfs/libglusterfs-messages.h"
+#include "glusterfs/syscall.h"
 
 /******************************************************************************
  *
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.h b/libglusterfs/src/gfdb/gfdb_sqlite3.h
index d8af800db3c..d8240e905f7 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3.h
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3.h
@@ -13,10 +13,10 @@
 /*Sqlite3 header file*/
 #include <sqlite3.h>
 
-#include "logging.h"
+#include "glusterfs/logging.h"
 #include "gfdb_data_store_types.h"
 #include "gfdb_mem-types.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 #define GF_STMT_SIZE_MAX 2048