diff --git a/build_scripts/qt/sources.pri b/build_scripts/qt/sources.pri
index 48cf95f..c3262bb 100644
--- a/build_scripts/qt/sources.pri
+++ b/build_scripts/qt/sources.pri
@@ -17,7 +17,8 @@ SOURCES += src/main.cpp\
     src/utils/setup.cpp \
     src/utils/paths.cpp \
     src/openvr/overlay_utils.cpp \
-    src/tabcontrollers/keyboardinput/KeyboardInput.cpp \
+    src/keyboard_input/keyboard_input.cpp \
+    src/media_keys/media_keys.cpp \
     src/keyboard_input/input_parser.cpp
 
 HEADERS += src/overlaycontroller.h \
@@ -33,7 +34,8 @@ HEADERS += src/overlaycontroller.h \
     src/tabcontrollers/VideoTabController.h \
     src/tabcontrollers/AudioManager.h \
     src/tabcontrollers/PttController.h \
-    src/tabcontrollers/keyboardinput/KeyboardInput.h \
+    src/keyboard_input/keyboard_input.h \
+    src/media_keys/media_keys.h \
     src/utils/Matrix.h \
     src/utils/ChaperoneUtils.h \
     src/quaternion/quaternion.h \
@@ -63,11 +65,17 @@ unix:!macx {
         LIBS += -lXtst
     }
     else {
-        SOURCES += src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp
+        SOURCES += src/keyboard_input/input_sender_dummy.cpp
     }
+    SOURCES += src/tabcontrollers/audiomanager/AudioManagerDummy.cpp
+    HEADERS += src/tabcontrollers/audiomanager/AudioManagerDummy.h
 }
 
 macx {
+    SOURCES += src/keyboard_input/input_sender_dummy.cpp
+    SOURCES += src/tabcontrollers/audiomanager/AudioManagerDummy.cpp
+    HEADERS += src/tabcontrollers/audiomanager/AudioManagerDummy.h
+
 }
 
 win32-msvc {
diff --git a/src/keyboard_input/input_sender_dummy.cpp b/src/keyboard_input/input_sender_dummy.cpp
new file mode 100644
index 0000000..7d9dbda
--- /dev/null
+++ b/src/keyboard_input/input_sender_dummy.cpp
@@ -0,0 +1,6 @@
+#include "input_sender.h"
+
+void sendTokensAsInput( [[maybe_unused]] const std::vector<Token> tokens )
+{
+    // dummy
+}
diff --git a/src/tabcontrollers/keyboardinput/KeyboardInput.cpp b/src/keyboard_input/keyboard_input.cpp
similarity index 85%
rename from src/tabcontrollers/keyboardinput/KeyboardInput.cpp
rename to src/keyboard_input/keyboard_input.cpp
index 3755fc0..e5577d6 100644
--- a/src/tabcontrollers/keyboardinput/KeyboardInput.cpp
+++ b/src/keyboard_input/keyboard_input.cpp
@@ -1,4 +1,4 @@
-#include "KeyboardInput.h"
+#include "keyboard_input.h"
 #include "src/keyboard_input/input_sender.h"
 
 namespace keyboardinput
@@ -56,24 +56,4 @@ void sendKeyboardCtrlV()
     sendTokensAsInput( tokens );
 }
 
-void sendMediaNextSong()
-{
-    // noop
-}
-
-void sendMediaPreviousSong()
-{
-    // noop
-}
-
-void sendMediaPausePlay()
-{
-    // noop
-}
-
-void sendMediaStopSong()
-{
-    // noop
-}
-
 } // namespace keyboardinput
diff --git a/src/tabcontrollers/keyboardinput/KeyboardInput.h b/src/keyboard_input/keyboard_input.h
similarity index 83%
rename from src/tabcontrollers/keyboardinput/KeyboardInput.h
rename to src/keyboard_input/keyboard_input.h
index f79ac52..3c553fd 100644
--- a/src/tabcontrollers/keyboardinput/KeyboardInput.h
+++ b/src/keyboard_input/keyboard_input.h
@@ -23,9 +23,5 @@ void sendKeyboardAltTab();
 void sendKeyboardAltEnter();
 void sendKeyboardCtrlC();
 void sendKeyboardCtrlV();
-void sendMediaNextSong();
-void sendMediaPreviousSong();
-void sendMediaPausePlay();
-void sendMediaStopSong();
 
 } // namespace keyboardinput
diff --git a/src/media_keys/media_keys.cpp b/src/media_keys/media_keys.cpp
new file mode 100644
index 0000000..7cc126c
--- /dev/null
+++ b/src/media_keys/media_keys.cpp
@@ -0,0 +1,26 @@
+#include "media_keys.h"
+#include "src/keyboard_input/input_sender.h"
+
+namespace keyboardinput
+{
+void sendMediaNextSong()
+{
+    // noop
+}
+
+void sendMediaPreviousSong()
+{
+    // noop
+}
+
+void sendMediaPausePlay()
+{
+    // noop
+}
+
+void sendMediaStopSong()
+{
+    // noop
+}
+
+} // namespace keyboardinput
diff --git a/src/media_keys/media_keys.h b/src/media_keys/media_keys.h
new file mode 100644
index 0000000..00b0768
--- /dev/null
+++ b/src/media_keys/media_keys.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <vector>
+#include <QString>
+
+namespace keyboardinput
+{
+/*!
+Represents the state of a keyboard button press. Can be either Up or Down.
+
+Implemented because neither Qt nor Windows.h included a sensible key state enum.
+*/
+void sendMediaNextSong();
+void sendMediaPreviousSong();
+void sendMediaPausePlay();
+void sendMediaStopSong();
+
+} // namespace keyboardinput
diff --git a/src/tabcontrollers/UtilitiesTabController.h b/src/tabcontrollers/UtilitiesTabController.h
index 0a34a00..87f73a6 100644
--- a/src/tabcontrollers/UtilitiesTabController.h
+++ b/src/tabcontrollers/UtilitiesTabController.h
@@ -5,7 +5,8 @@
 #include <QTime>
 #include <openvr.h>
 #include <memory>
-#include "keyboardinput/KeyboardInput.h"
+#include "src/keyboard_input/keyboard_input.h"
+#include "src/media_keys/media_keys.h"
 
 class QQuickWindow;
 // application namespace