diff --git a/gui/controls.cpp b/gui/controls.cpp
deleted file mode 100644
index 65b85024..00000000
--- a/gui/controls.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2014 (c) Anna Schumaker.
- */
-#include <lib/lib.h>
-#include <core/audio.h>
-#include <gui/ocarina.h>
-
-void o_toggle()
-{
-	if (audio :: get_driver()->is_playing())
-		audio :: pause();
-	else
-		audio :: play();
-}
diff --git a/gui/gst.cpp b/gui/gst.cpp
index 2c2de598..794d18bb 100644
--- a/gui/gst.cpp
+++ b/gui/gst.cpp
@@ -161,6 +161,14 @@ static bool on_timeout()
 	return true;
 }
 
+void on_toggle()
+{
+	if (gst_driver->is_playing())
+		audio :: pause();
+	else
+		audio :: play();
+}
+
 
 void init_gst(int *argc, char ***argv)
 {
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 53b6b7c7..3ed9307f 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -8,7 +8,6 @@
 #include <lib/colmgr.h>
 #include <lib/lib.h>
 
-#include <gui/controls.h>
 #include <gui/ocarina.h>
 #include <gui/tabs.h>
 
diff --git a/gui/window.cpp b/gui/window.cpp
index 442068e2..d25976cf 100644
--- a/gui/window.cpp
+++ b/gui/window.cpp
@@ -4,7 +4,6 @@
 #include <core/audio.h>
 #include <core/deck.h>
 #include <core/version.h>
-#include <gui/controls.h>
 #include <gui/ocarina.h>
 #include <gui/tabs.h>
 
@@ -50,10 +49,10 @@ static bool on_window_key_released(GdkEventKey *event)
 {
 	std::string key = gdk_keyval_name(event->keyval);
 
-	if (key == "space")
-		o_toggle();
-	else
+	if (key != "space")
 		return false;
+
+	on_toggle();
 	return true;
 }
 
diff --git a/include/gui/controls.h b/include/gui/controls.h
deleted file mode 100644
index 97d9d6f2..00000000
--- a/include/gui/controls.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright 2014 (c) Anna Schumaker.
- */
-#ifndef OCARINA_GUI_CONTROLS_H
-#define OCARINA_GUI_CONTROLS_H
-
-void o_toggle();
-void on_next();
-
-
-#endif /* OCARINA_GUI_CONTROLS_H */
diff --git a/include/gui/ocarina.h b/include/gui/ocarina.h
index 8bc61237..84373f58 100644
--- a/include/gui/ocarina.h
+++ b/include/gui/ocarina.h
@@ -27,6 +27,8 @@ void post_init_queue_tabs();
 
 
 /* gst.cpp */
+void on_next();
+void on_toggle();
 void init_gst(int *, char ***);
 void quit_gst();