enh: Rename private sources, include public headers with rel path

7 files changed, 12 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fd9d70..ca7c147 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -350,8 +350,8 @@ set (PRIVATE_HDRS
 
 set (GFLAGS_SRCS
   "gflags.cc"
-  "gflags_reporting.cc"
-  "gflags_completions.cc"
+  "reporting.cc"
+  "completions.cc"
 )
 
 if (OS_WINDOWS)
diff --git a/src/gflags_completions.cc b/src/completions.cc
index 8fefa1b..875088d 100644
--- a/src/gflags_completions.cc
+++ b/src/completions.cc
@@ -46,11 +46,6 @@
 //     5a) Force bash to place most-relevent groups at the top of the list
 //     5b) Trim most flag's descriptions to fit on a single terminal line
 
-
-#include "gflags_completions.h"
-
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>   // for strlen
@@ -60,9 +55,12 @@
 #include <utility>
 #include <vector>
 
-#include "gflags.h"
+#include "config.h"
 #include "util.h"
 
+#include "gflags/gflags.h"
+#include "gflags/gflags_completions.h"
+
 using std::set;
 using std::string;
 using std::vector;
diff --git a/src/gflags.cc b/src/gflags.cc
index 42dcd04..bc62227 100644
--- a/src/gflags.cc
+++ b/src/gflags.cc
@@ -88,7 +88,7 @@
 // are, similarly, mostly hooks into the functionality described above.
 
 #include "config.h"
-#include "gflags.h"
+#include "gflags/gflags.h"
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/src/gflags.h.in b/src/gflags.h.in
index 3732636..43b3f7a 100644
--- a/src/gflags.h.in
+++ b/src/gflags.h.in
@@ -81,7 +81,7 @@
 #include <string>
 #include <vector>
 
-#include "gflags_declare.h" // IWYU pragma: export
+#include "gflags/gflags_declare.h" // IWYU pragma: export
 
 
 // We always want to export variables defined in user code
diff --git a/src/mutex.h b/src/mutex.h
index ff96f2b..1648c2f 100644
--- a/src/mutex.h
+++ b/src/mutex.h
@@ -106,7 +106,7 @@
 #ifndef GFLAGS_MUTEX_H_
 #define GFLAGS_MUTEX_H_
 
-#include "gflags_declare.h"     // to figure out pthreads support
+#include "gflags/gflags_declare.h"     // to figure out pthreads support
 
 #if defined(NO_THREADS)
   typedef int MutexType;        // to keep a lock-count
diff --git a/src/gflags_reporting.cc b/src/reporting.cc
index fb17059..7cc6691 100644
--- a/src/gflags_reporting.cc
+++ b/src/reporting.cc
@@ -56,8 +56,8 @@
 #include <vector>
 
 #include "config.h"
-#include "gflags.h"
-#include "gflags_completions.h"
+#include "gflags/gflags.h"
+#include "gflags/gflags_completions.h"
 #include "util.h"
 
 
diff --git a/src/util.h b/src/util.h
index 164e3cf..e6b28cc 100644
--- a/src/util.h
+++ b/src/util.h
@@ -35,6 +35,7 @@
 #define GFLAGS_UTIL_H_
 
 #include "config.h"
+#include "gflags/gflags_declare.h" // GFLAGS_NAMESPACE
 
 #include <assert.h>
 #ifdef HAVE_INTTYPES_H