diff --git a/include/libsaria/callback.h b/include/libsaria/callback.h
index 8528c485..4198c4cb 100644
--- a/include/libsaria/callback.h
+++ b/include/libsaria/callback.h
@@ -7,4 +7,7 @@ enum callback_t {
 	VOLUME,
 };
 
+void register_callback(callback_t, void (*)());
+void trigger_callback(callback_t);
+
 #endif /* LIBSARIA_CALLBACKS_H */
diff --git a/include/libsaria/libsaria.h b/include/libsaria/libsaria.h
index 482e150f..ef3e3964 100644
--- a/include/libsaria/libsaria.h
+++ b/include/libsaria/libsaria.h
@@ -11,7 +11,6 @@ class Libsaria
 	private:
 		Audio audio;
 		Idle  idle;
-		void trigger_callback(callback_t);
 
 	public:
 		Libsaria(int, char**);
@@ -21,7 +20,6 @@ class Libsaria
 		void load(string);
 		void set_volume(double);
 		double get_volume();
-		void register_callback(callback_t, void (*)());
 		void run_idle_task();
 
 		/* Control functions */
diff --git a/libsaria/callback.cpp b/libsaria/callback.cpp
index 8555f3c5..e91452ef 100644
--- a/libsaria/callback.cpp
+++ b/libsaria/callback.cpp
@@ -7,7 +7,7 @@ using namespace std;
 
 static map<callback_t, void (*)()> callbacks;
 
-void Libsaria::trigger_callback(callback_t type)
+void trigger_callback(callback_t type)
 {
 	map<callback_t, void (*)()>::iterator it;
 	it=callbacks.find(type);
@@ -15,7 +15,7 @@ void Libsaria::trigger_callback(callback_t type)
 		it->second();
 }
 
-void Libsaria::register_callback(callback_t type, void (* func)())
+void register_callback(callback_t type, void (* func)())
 {
 	callbacks[type] = func;
 }
diff --git a/libsaria/controls.cpp b/libsaria/controls.cpp
index a285fd2a..212ca477 100644
--- a/libsaria/controls.cpp
+++ b/libsaria/controls.cpp
@@ -1,5 +1,6 @@
 
 #include <libsaria/libsaria.h>
+#include <libsaria/callback.h>
 #include <libsaria/audio.h>
 
 /*
diff --git a/ocarina/callback.cpp b/ocarina/callback.cpp
index 17a55728..6cc67ad6 100644
--- a/ocarina/callback.cpp
+++ b/ocarina/callback.cpp
@@ -1,5 +1,6 @@
 
-#include <libsaria/libsaria.h>
+#include <libsaria/callback.h>
+#include <libsaria/print.h>
 #include <ocarina/button.h>
 
 void cb_play()
@@ -18,7 +19,7 @@ void cb_pause()
 
 static void add_callback(callback_t type, void (* func)())
 {
-	libsaria_get()->register_callback(type, func);
+	register_callback(type, func);
 }
 
 void setup_callbacks()