Index: sources/storage/usbwatcher.h
===================================================================
diff -u -rfeb3423b373dc2a2c4267ef9fcb4d924d738423d -r5e78f0799b46963feb5756decb1a27b952cd19b3
--- sources/storage/usbwatcher.h	(.../usbwatcher.h)	(revision feb3423b373dc2a2c4267ef9fcb4d924d738423d)
+++ sources/storage/usbwatcher.h	(.../usbwatcher.h)	(revision 5e78f0799b46963feb5756decb1a27b952cd19b3)
@@ -20,7 +20,7 @@
 #include "main.h"
 
 // Define
-#define _USBWatcher USBWatcher::I()
+#define _USBWatcher Storage::USBWatcher::I()
 
 namespace Storage {
 
@@ -35,14 +35,12 @@
     const int   _checkInterval  = 1000; // in ms
 
 // Singleton
-SINGLETON_DECL(USBWatcher)
+SINGLETON(USBWatcher)
 
 public:
     bool init();
     void quit();
 
-    bool isMounted () const;
-    bool isUmounted() const;
 
 protected:
     void timerEvent(QTimerEvent *) override;
@@ -52,6 +50,9 @@
 
     bool usbSeek(QString &vDevice);
 
+    bool isMounted () const;
+    bool isUmounted() const;
+
 signals:
     void didUSBDriveMount ();
     void didUSBDriveUmount();