diff --git a/contrib/epee/include/warnings.h b/contrib/epee/include/warnings.h
index bbdcd9fe..433372fc 100644
--- a/contrib/epee/include/warnings.h
+++ b/contrib/epee/include/warnings.h
@@ -12,9 +12,13 @@
 #define DISABLE_GCC_WARNING(w)
 #define DISABLE_CLANG_WARNING(w)
 #define DISABLE_GCC_AND_CLANG_WARNING(w)
+#define ATTRIBUTE_UNUSED 
 
 #else
 
+
+#define ATTRIBUTE_UNUSED __attribute__((unused))
+
 #include <boost/preprocessor/stringize.hpp>
 
 #define PUSH_VS_WARNINGS
diff --git a/src/common/variant_helper.h b/src/common/variant_helper.h
index f0439db2..7fcf996b 100644
--- a/src/common/variant_helper.h
+++ b/src/common/variant_helper.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#define VARIANT_SWITCH_BEGIN(v_type_obj) {auto & local_reference_eokcmeokmeokcm = v_type_obj; if(false) {;
-#define VARIANT_CASE_CONST(v_type, typed_name) } else if(local_reference_eokcmeokmeokcm.type() == typeid(v_type)) {  const v_type& typed_name = boost::get<v_type>(local_reference_eokcmeokmeokcm);
-#define VARIANT_CASE(v_type, typed_name) } else if(local_reference_eokcmeokmeokcm.type() == typeid(v_type)) {  v_type& typed_name = boost::get<v_type>(local_reference_eokcmeokmeokcm);
+#define VARIANT_SWITCH_BEGIN(v_type_obj) {auto & local_reference_eokcmeokmeokcm ATTRIBUTE_UNUSED = v_type_obj; if(false) {;
+#define VARIANT_CASE_CONST(v_type, typed_name) } else if(local_reference_eokcmeokmeokcm.type() == typeid(v_type)) {  const v_type& typed_name ATTRIBUTE_UNUSED = boost::get<v_type>(local_reference_eokcmeokmeokcm);
+#define VARIANT_CASE(v_type, typed_name) } else if(local_reference_eokcmeokmeokcm.type() == typeid(v_type)) {  v_type& typed_name ATTRIBUTE_UNUSED = boost::get<v_type>(local_reference_eokcmeokmeokcm);
 #define VARIANT_CASE_TV(v_type) VARIANT_CASE(v_type, tv) 
 #define VARIANT_CASE_OTHER() } else { 
 #define VARIANT_CASE_THROW_ON_OTHER() } else { ASSERT_MES_AND_THROW("Unknown type in switch statemet: " << local_reference_eokcmeokmeokcm.type().name());
diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp
index 3c630e5d..36de2bbd 100644
--- a/src/currency_core/currency_format_utils.cpp
+++ b/src/currency_core/currency_format_utils.cpp
@@ -1737,8 +1737,6 @@ namespace currency
     result.ftp = ftp;
     CHECK_AND_ASSERT_MES(destinations.size() <= CURRENCY_TX_MAX_ALLOWED_OUTS, false, "Too many outs (" << destinations.size() << ")! Tx can't be constructed.");
 
-    bool watch_only_mode = sender_account_keys.spend_secret_key == null_skey;
-
     bool append_mode = false;
     if (flags&TX_FLAG_SIGNATURE_MODE_SEPARATE && tx.vin.size())
       append_mode = true;
diff --git a/src/serialization/serialization.h b/src/serialization/serialization.h
index 6e16b498..5b5383b1 100644
--- a/src/serialization/serialization.h
+++ b/src/serialization/serialization.h
@@ -61,7 +61,7 @@ inline bool do_serialize(Archive &ar, T &v)
 #define VARIANT_TAG(A, T, Tg) \
   template <bool W> struct variant_serialization_traits<A<W>, T> { static inline typename A<W>::variant_tag_type get_tag() { return Tg; } }
 #define BEGIN_SERIALIZE() \
-  template <bool W, template <bool> class Archive> bool do_serialize(Archive<W> &_ser_ar) {uint8_t s_current_version = 0; uint8_t s_version = 0;
+  template <bool W, template <bool> class Archive> bool do_serialize(Archive<W> &_ser_ar) {uint8_t s_current_version ATTRIBUTE_UNUSED = 0; uint8_t s_version ATTRIBUTE_UNUSED = 0;
 #define BEGIN_SERIALIZE_OBJECT() \
   template <bool W, template <bool> class Archive> bool do_serialize(Archive<W> &_ser_ar) { _ser_ar.begin_object(); bool _ser_res = do_serialize_object(_ser_ar); _ser_ar.end_object(); return _ser_res; } \
   template <bool W, template <bool> class Archive> bool do_serialize_object(Archive<W> &_ser_ar){