diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp
index 14ca3bb5..c394aec1 100644
--- a/gui/ocarina.cpp
+++ b/gui/ocarina.cpp
@@ -7,10 +7,10 @@ extern "C" {
 #include <gui/audio.h>
 #include <gui/builder.h>
 #include <gui/settings.h>
+#include <gui/window.h>
 }
 #include <gui/ocarina.h>
 #include <gui/tabs.h>
-#include <gui/window.h>
 
 
 static std::string ocarina_dir = "";
diff --git a/gui/window.cpp b/gui/window.c
similarity index 64%
rename from gui/window.cpp
rename to gui/window.c
index b4ea391c..18acf1bc 100644
--- a/gui/window.cpp
+++ b/gui/window.c
@@ -1,18 +1,17 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-extern "C" {
 #include <core/version.h>
 #include <gui/builder.h>
-}
-#include <gui/ocarina.h>
 
-const std::string appname = "Ocarina ";
 
 void gui_window_init(const gchar *icon)
 {
 	GtkWindow *window = GTK_WINDOW(gui_builder_widget("o_window"));
+	gchar *title = g_strdup_printf("Ocarina %s", get_version());
 
-	gtk_window_set_title(window, (appname + get_version()).c_str());
+	gtk_window_set_title(window, title);
 	gtk_window_set_icon_from_file(window, icon, NULL);
+
+	g_free(title);
 }