diff --git a/mbtiles.c b/mbtiles.cpp
similarity index 96%
rename from mbtiles.c
rename to mbtiles.cpp
index def1b94..2581d57 100644
--- a/mbtiles.c
+++ b/mbtiles.cpp
@@ -7,7 +7,10 @@
 #include <sqlite3.h>
 #include "pool.h"
 #include "tile.h"
-#include "mbtiles.h"
+
+extern "C" {
+	#include "mbtiles.h"
+};
 
 sqlite3 *mbtiles_open(char *dbname, char **argv, int forcetable) {
 	sqlite3 *outdb;
@@ -98,7 +101,7 @@ static void quote(char **buf, const char *s) {
 	}
 
 	*out = '\0';
-	*buf = realloc(*buf, strlen(*buf) + strlen(tmp) + 1);
+	*buf = (char *) realloc(*buf, strlen(*buf) + strlen(tmp) + 1);
 	if (*buf == NULL) {
 		perror("realloc");
 		exit(EXIT_FAILURE);
@@ -117,7 +120,7 @@ static void aprintf(char **buf, const char *format, ...) {
 	}
 	va_end(ap);
 
-	*buf = realloc(*buf, strlen(*buf) + strlen(tmp) + 1);
+	*buf = (char *) realloc(*buf, strlen(*buf) + strlen(tmp) + 1);
 	if (*buf == NULL) {
 		perror("Out of memory");
 		exit(EXIT_FAILURE);
@@ -127,8 +130,8 @@ static void aprintf(char **buf, const char *format, ...) {
 }
 
 static int pvcmp(const void *v1, const void *v2) {
-	const struct pool_val *const *pv1 = v1;
-	const struct pool_val *const *pv2 = v2;
+	const struct pool_val *const *pv1 = (const struct pool_val *const *) v1;
+	const struct pool_val *const *pv2 = (const struct pool_val *const *) v2;
 
 	int n = strcmp((*pv1)->s, (*pv2)->s);
 	if (n != 0) {