Drag header files into C++

decode.cpp

@@ -12,11 +12,8 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include "mvt.hpp"
-#include "tile.h"
-
-extern "C" {
-#include "projection.h"
-}
+#include "tile.hpp"
+#include "projection.hpp"
 
 void printq(const char *s) {
 	putchar('"');

geojson.cpp

@@ -32,14 +32,15 @@
 
 extern "C" {
 #include "jsonpull.h"
-#include "tile.h"
-#include "pool.h"
-#include "mbtiles.h"
-#include "projection.h"
-#include "version.h"
-#include "memfile.h"
 }
 
+#include "tile.hpp"
+#include "pool.hpp"
+#include "mbtiles.hpp"
+#include "projection.hpp"
+#include "version.hpp"
+#include "memfile.hpp"
+
 static int low_detail = 12;
 static int full_detail = -1;
 static int min_detail = 7;

geometry.cpp

@@ -8,14 +8,11 @@
 #include <unistd.h>
 #include <cmath>
 #include <limits.h>
+#include <sqlite3.h>
 #include "geometry.hpp"
 #include "clipper/clipper.hpp"
-
-extern "C" {
-#include <sqlite3.h>
-#include "tile.h"
-#include "projection.h"
-}
+#include "tile.hpp"
+#include "projection.hpp"
 
 static int pnpoly(drawvec &vert, size_t start, size_t nvert, long long testx, long long testy);
 static int clip(double *x0, double *y0, double *x1, double *y1, double xmin, double ymin, double xmax, double ymax);

mbtiles.cpp

@@ -5,12 +5,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sqlite3.h>
-#include "pool.h"
-#include "tile.h"
-
-extern "C" {
-#include "mbtiles.h"
-};
+#include "pool.hpp"
+#include "tile.hpp"
+#include "mbtiles.hpp"
 
 sqlite3 *mbtiles_open(char *dbname, char **argv, int forcetable) {
 	sqlite3 *outdb;

memfile.cpp

@@ -2,10 +2,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/mman.h>
-
-extern "C" {
-#include "memfile.h"
-}
+#include "memfile.hpp"
 
 #define INCREMENT 131072
 

pool.cpp

@@ -1,10 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-extern "C" {
-#include "pool.h"
-}
+#include "pool.hpp"
 
 #define POOL_WIDTH 256
 

projection.cpp

@@ -1,8 +1,5 @@
 #include <math.h>
-
-extern "C" {
-#include "projection.h"
-}
+#include "projection.hpp"
 
 // http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames
 void latlon2tile(double lat, double lon, int zoom, long long *x, long long *y) {

tile-join.cpp

@@ -10,13 +10,10 @@
 #include <zlib.h>
 #include <math.h>
 #include "mvt.hpp"
-#include "tile.h"
-
-extern "C" {
-#include "projection.h"
-#include "pool.h"
-#include "mbtiles.h"
-}
+#include "tile.hpp"
+#include "projection.hpp"
+#include "pool.hpp"
+#include "mbtiles.hpp"
 
 std::string dequote(std::string s);
 

tile.cpp

@@ -21,13 +21,10 @@
 #include <errno.h>
 #include "mvt.hpp"
 #include "geometry.hpp"
-
-extern "C" {
-#include "tile.h"
-#include "pool.h"
-#include "mbtiles.h"
-#include "projection.h"
-}
+#include "tile.hpp"
+#include "pool.hpp"
+#include "mbtiles.hpp"
+#include "projection.hpp"
 
 #define CMD_BITS 3