diff --git a/src/AppConfig.h b/src/AppConfig.h
index ca5c77d..5d78e78 100644
--- a/src/AppConfig.h
+++ b/src/AppConfig.h
@@ -179,9 +179,10 @@ private:
     std::atomic<float> spectrumAvgSpeed, mainSplit, visSplit, bookmarkSplit;
     std::atomic_int dbOffset;
     std::vector<SDRManualDef> manualDevices;
+    std::atomic_bool bookmarksVisible;
 #if USE_HAMLIB
     std::atomic_int rigModel, rigRate;
     std::string rigPort;
-    std::atomic_bool rigEnabled, rigFollowMode, rigControlMode, rigCenterLock, rigFollowModem, bookmarksVisible;
+    std::atomic_bool rigEnabled, rigFollowMode, rigControlMode, rigCenterLock, rigFollowModem;
 #endif
 };
diff --git a/src/AppFrame.h b/src/AppFrame.h
index f186e9e..e45974a 100644
--- a/src/AppFrame.h
+++ b/src/AppFrame.h
@@ -189,6 +189,9 @@ private:
 
     bool lowPerfMode;
 
+    wxMenuItem *hideBookmarksItem;
+    bool saveDisabled;
+
 #ifdef USE_HAMLIB
     void enableRig();
     void disableRig();
@@ -201,7 +204,7 @@ private:
     wxMenuItem *rigCenterLockMenuItem;
     wxMenuItem *rigFollowModemMenuItem;
     wxMenuItem *sdrIFMenuItem;
-    wxMenuItem *hideBookmarksItem;
+    
     std::map<int, wxMenuItem *> rigSerialMenuItems;
     std::map<int, wxMenuItem *> rigModelMenuItems;
     int rigModel;
@@ -211,7 +214,6 @@ private:
     std::string rigPort;
     int numRigs;
     bool rigInit;
-    bool saveDisabled;
 #endif
 
     wxDECLARE_EVENT_TABLE();
diff --git a/src/demod/DemodulatorMgr.cpp b/src/demod/DemodulatorMgr.cpp
index c3bff6c..2a75d34 100644
--- a/src/demod/DemodulatorMgr.cpp
+++ b/src/demod/DemodulatorMgr.cpp
@@ -9,6 +9,7 @@
 #include <algorithm>
 
 #include "DemodulatorMgr.h"
+#include "CubicSDR.h"
 
 #if USE_HAMLIB
 #include "RigThread.h"