move headers to include directory

src/backend/columnar/cstore.c

@@ -20,7 +20,7 @@
 #include "utils/guc.h"
 #include "utils/rel.h"
 
-#include "cstore.h"
+#include "columnar/cstore.h"
 
 /* Default values for option parameters */
 #define DEFAULT_COMPRESSION_TYPE COMPRESSION_NONE

src/backend/columnar/cstore_compression.c

@@ -19,7 +19,7 @@
 #include "utils/pg_lzcompress.h"
 #endif
 
-#include "cstore.h"
+#include "columnar/cstore.h"
 
 
 #if PG_VERSION_NUM >= 90500

src/backend/columnar/cstore_customscan.c

@@ -22,9 +22,9 @@
 #include "optimizer/restrictinfo.h"
 #include "utils/relcache.h"
 
-#include "cstore.h"
-#include "cstore_customscan.h"
-#include "cstore_tableam.h"
+#include "columnar/cstore.h"
+#include "columnar/cstore_customscan.h"
+#include "columnar/cstore_tableam.h"
 
 typedef struct CStoreScanPath
 {

src/backend/columnar/cstore_fdw.c

@@ -75,9 +75,9 @@
 #endif
 #include "utils/syscache.h"
 
-#include "cstore.h"
-#include "cstore_fdw.h"
-#include "cstore_version_compat.h"
+#include "columnar/cstore.h"
+#include "columnar/cstore_fdw.h"
+#include "columnar/cstore_version_compat.h"
 
 /* table containing information about how to partition distributed tables */
 #define CITUS_EXTENSION_NAME "citus"

src/backend/columnar/cstore_metadata_tables.c

@@ -9,8 +9,8 @@
 
 
 #include "postgres.h"
-#include "cstore.h"
-#include "cstore_version_compat.h"
+#include "columnar/cstore.h"
+#include "columnar/cstore_version_compat.h"
 
 #include <sys/stat.h>
 #include "access/heapam.h"

src/backend/columnar/cstore_reader.c

@@ -34,8 +34,8 @@
 #include "utils/lsyscache.h"
 #include "utils/rel.h"
 
-#include "cstore.h"
-#include "cstore_version_compat.h"
+#include "columnar/cstore.h"
+#include "columnar/cstore_version_compat.h"
 
 /* static function declarations */
 static StripeBuffers * LoadFilteredStripeBuffers(Relation relation,

src/backend/columnar/cstore_tableam.c

@@ -42,10 +42,10 @@
 #include "utils/rel.h"
 #include "utils/syscache.h"
 
-#include "cstore.h"
-#include "cstore_customscan.h"
-#include "cstore_tableam.h"
-#include "cstore_version_compat.h"
+#include "columnar/cstore.h"
+#include "columnar/cstore_customscan.h"
+#include "columnar/cstore_tableam.h"
+#include "columnar/cstore_version_compat.h"
 
 #define CSTORE_TABLEAM_NAME "cstore_tableam"
 

src/backend/columnar/cstore_writer.c

@@ -24,8 +24,8 @@
 #include "utils/memutils.h"
 #include "utils/rel.h"
 
-#include "cstore.h"
-#include "cstore_version_compat.h"
+#include "columnar/cstore.h"
+#include "columnar/cstore_version_compat.h"
 
 static StripeBuffers * CreateEmptyStripeBuffers(uint32 stripeMaxRowCount,
 												uint32 blockRowCount,

src/backend/columnar/mod.c

@@ -15,15 +15,15 @@
 
 #include "fmgr.h"
 
-#include "cstore.h"
-#include "mod.h"
+#include "columnar/cstore.h"
+#include "columnar/mod.h"
 
 #ifdef USE_TABLEAM
-#include "cstore_tableam.h"
+#include "columnar/cstore_tableam.h"
 #endif
 
 #ifdef USE_FDW
-#include "cstore_fdw.h"
+#include "columnar/cstore_fdw.h"
 #endif
 
 PG_MODULE_MAGIC;