1 files changed, 8 insertions, 5 deletions
diff --git a/options/scoped.hpp b/options/scoped.hpp
index 49c3d18f..81e6bd19 100644
--- a/options/scoped.hpp
+++ b/options/scoped.hpp
@@ -6,8 +6,6 @@
 
 #include "export.hpp"
 
-#include <atomic>
-
 namespace options {
 
 struct OTR_OPTIONS_EXPORT with_tracker_teardown final
@@ -26,11 +24,16 @@ struct OTR_OPTIONS_EXPORT opts
 
     bundle b;
 
-    virtual ~opts();
-    opts(const QString& name);
-
     opts& operator=(const opts&) = delete;
     opts(const opts&) = delete;
+
+    void set_raii_dtor_state(bool x) { raii = x; }
+
+protected:
+    explicit opts(const QString& name);
+    ~opts();
+private:
+    bool raii = true;
 };
 
 }