diff --git a/other/icons/Teewars.ico b/other/icons/Teewars.ico
new file mode 100644
index 000000000..bf683b9cc
Binary files /dev/null and b/other/icons/Teewars.ico differ
diff --git a/other/icons/teewars.rc b/other/icons/teewars.rc
new file mode 100644
index 000000000..46c2f62a7
--- /dev/null
+++ b/other/icons/teewars.rc
@@ -0,0 +1 @@
+50h ICON "teewars.ico"
\ No newline at end of file
diff --git a/src/engine/config.h b/src/engine/config.h
index ce0a6567f..f5af8779c 100644
--- a/src/engine/config.h
+++ b/src/engine/config.h
@@ -1,6 +1,10 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
+#ifdef __cplusplus
+extern "C"{
+#endif
+
 typedef struct
 { 
     #define MACRO_CONFIG_INT(name,def,min,max) int name;
@@ -29,4 +33,8 @@ void config_save(const char *filename);
 #undef MACRO_CONFIG_INT
 #undef MACRO_CONFIG_STR
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp
index a106df916..dbcf60ba9 100644
--- a/src/game/client/menu.cpp
+++ b/src/game/client/menu.cpp
@@ -126,6 +126,9 @@ void draw_box(int box_type, gui_tileset_enum tileset, float x, float y, float w,
 	draw_area(tileset, cx, cy, dx-cx, dy-cy, x+w-(dx-cx), y+h-(dy-cy), dx-cx, dy-cy);
 }
 
+extern "C"
+{
+
 struct pretty_font
 {
     float m_CharStartTable[256];
@@ -135,6 +138,8 @@ struct pretty_font
 
 extern pretty_font *current_font;
 
+}
+
 extern void render_sun(float x, float y);
 extern void select_sprite(int id, int flags=0, int sx=0, int sy=0);
 extern void draw_sprite(float x, float y, float size);
@@ -1263,7 +1268,7 @@ static int ingame_main_render()
 	return 0;
 }
 
-extern double extra_kerning[256*256];
+extern "C" double extra_kerning[256*256];
 
 static int kerning_render()
 {
diff --git a/src/game/game.h b/src/game/game.h
index d3b491fcb..4fa22c08e 100644
--- a/src/game/game.h
+++ b/src/game/game.h
@@ -109,7 +109,7 @@ inline bool col_check_point(vec2 p) { return col_check_point(p.x, p.y); }
 struct mapres_entity
 {
 	int x, y;
-	int data[];
+	int *data;
 };
 
 struct mapres_spawnpoint