diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cfb277e18..f9cd2d2b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -838,7 +838,7 @@ optional_source(APPLE
     core/macscreensaver.cpp
     core/macfslistener.mm
     widgets/osd_mac.mm
-    engine/osxdevicefinder.cpp
+    engine/macosdevicefinder.cpp
     globalshortcuts/globalshortcutbackend-macos.mm
     globalshortcuts/globalshortcutgrabber-macos.mm
   HEADERS
diff --git a/src/engine/enginedevice.cpp b/src/engine/enginedevice.cpp
index fd414fa35..33fa47aab 100644
--- a/src/engine/enginedevice.cpp
+++ b/src/engine/enginedevice.cpp
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef Q_OS_MACOS
-#  include "osxdevicefinder.h"
+#  include "macosdevicefinder.h"
 #endif
 
 #ifdef Q_OS_WIN32
diff --git a/src/engine/osxdevicefinder.cpp b/src/engine/macosdevicefinder.cpp
similarity index 96%
rename from src/engine/osxdevicefinder.cpp
rename to src/engine/macosdevicefinder.cpp
index adf9f4e3c..db4199eee 100644
--- a/src/engine/osxdevicefinder.cpp
+++ b/src/engine/macosdevicefinder.cpp
@@ -27,10 +27,11 @@
 #include <QList>
 #include <QString>
 
-#include "osxdevicefinder.h"
 #include "core/logging.h"
 #include "core/scoped_cftyperef.h"
 
+#include "macosdevicefinder.h"
+
 namespace {
 
 template <typename T>
@@ -61,11 +62,11 @@ std::unique_ptr<T> GetProperty(const AudioDeviceID& device_id, const AudioObject
 }  // namespace
 
 
-OsxDeviceFinder::OsxDeviceFinder()
+MacOsDeviceFinder::MacOsDeviceFinder()
     : DeviceFinder("osxaudio", { "osxaudio", "osx", "osxaudiosink"} ) {
 }
 
-QList<DeviceFinder::Device> OsxDeviceFinder::ListDevices() {
+QList<DeviceFinder::Device> MacOsDeviceFinder::ListDevices() {
 
   QList<Device> ret;
 
diff --git a/src/engine/osxdevicefinder.h b/src/engine/macosdevicefinder.h
similarity index 83%
rename from src/engine/osxdevicefinder.h
rename to src/engine/macosdevicefinder.h
index 509e220a2..8fec14f25 100644
--- a/src/engine/osxdevicefinder.h
+++ b/src/engine/macosdevicefinder.h
@@ -18,21 +18,23 @@
  *
  */
 
-#ifndef OSXDEVICEFINDER_H
-#define OSXDEVICEFINDER_H
+#ifndef MACOSDEVICEFINDER_H
+#define MACOSDEVICEFINDER_H
 
 #include "config.h"
 
+#include <stdbool.h>
+
 #include <QList>
 
 #include "devicefinder.h"
 
-class OsxDeviceFinder : public DeviceFinder {
+class MacOsDeviceFinder : public DeviceFinder {
  public:
-  OsxDeviceFinder();
+  MacOsDeviceFinder();
 
   virtual bool Initialise() { return true; }
   virtual QList<Device> ListDevices();
 };
 
-#endif // OSXDEVICEFINDER_H
+#endif // MACOSDEVICEFINDER_H