diff --git a/libraries/chain/include/graphene/chain/confidential_evaluator.hpp b/libraries/chain/include/graphene/chain/confidential_evaluator.hpp
index 1f047c09..44d49e81 100644
--- a/libraries/chain/include/graphene/chain/confidential_evaluator.hpp
+++ b/libraries/chain/include/graphene/chain/confidential_evaluator.hpp
@@ -26,9 +26,9 @@
 
 namespace graphene { namespace chain {
 
-class transfer_to_blind_operation;
-class transfer_from_blind_operation;
-class blind_transfer_operation;
+struct transfer_to_blind_operation;
+struct transfer_from_blind_operation;
+struct blind_transfer_operation;
 
 class transfer_to_blind_evaluator : public evaluator<transfer_to_blind_evaluator>
 {
diff --git a/libraries/chain/include/graphene/chain/market_evaluator.hpp b/libraries/chain/include/graphene/chain/market_evaluator.hpp
index 9a9c9ae4..9d653c07 100644
--- a/libraries/chain/include/graphene/chain/market_evaluator.hpp
+++ b/libraries/chain/include/graphene/chain/market_evaluator.hpp
@@ -31,9 +31,9 @@ namespace graphene { namespace chain {
    class asset_object;
    class asset_bitasset_data_object;
    class call_order_object;
-   class call_order_update_operation;
-   class limit_order_cancel_operation;
-   class limit_order_create_operation;
+   struct call_order_update_operation;
+   struct limit_order_cancel_operation;
+   struct limit_order_create_operation;
 
    class limit_order_create_evaluator : public evaluator<limit_order_create_evaluator>
    {
diff --git a/libraries/db/include/graphene/db/object_id.hpp b/libraries/db/include/graphene/db/object_id.hpp
index 02304fc7..598ff3de 100644
--- a/libraries/db/include/graphene/db/object_id.hpp
+++ b/libraries/db/include/graphene/db/object_id.hpp
@@ -53,37 +53,22 @@ namespace graphene { namespace db {
       bool     is_null()const { return number == 0; }
       explicit operator uint64_t()const { return number; }
 
-      friend bool  operator == ( const object_id_type& a, const object_id_type& b )
-      {
-         return a.number == b.number;
-      }
-
-      friend bool  operator != ( const object_id_type& a, const object_id_type& b )
-      {
-         return a.number != b.number;
-      }
+      friend bool  operator == ( const object_id_type& a, const object_id_type& b ) { return a.number == b.number; }
+      friend bool  operator != ( const object_id_type& a, const object_id_type& b ) { return a.number != b.number; }
+      friend bool  operator < ( const object_id_type& a, const object_id_type& b ) { return a.number < b.number; }
+      friend bool  operator > ( const object_id_type& a, const object_id_type& b ) { return a.number > b.number; }
 
       object_id_type& operator++(int) { ++number; return *this; }
       object_id_type& operator++()    { ++number; return *this; }
 
-      friend object_id_type operator+(const object_id_type& a, int delta ) { 
+      friend object_id_type operator+(const object_id_type& a, int delta ) {
          return object_id_type( a.space(), a.type(), a.instance() + delta );
       }
-      friend object_id_type operator+(const object_id_type& a, int64_t delta ) { 
+      friend object_id_type operator+(const object_id_type& a, int64_t delta ) {
          return object_id_type( a.space(), a.type(), a.instance() + delta );
       }
       friend size_t hash_value( object_id_type v ) { return std::hash<uint64_t>()(v.number); }
 
-      friend bool operator< ( const object_id_type& a, const object_id_type& b )
-      {
-         return a.number < b.number;
-      }
-
-      friend bool operator> ( const object_id_type& a, const object_id_type& b )
-      {
-         return a.number > b.number;
-      }
-
       template< typename T >
       bool is() const
       {
@@ -134,40 +119,16 @@ namespace graphene { namespace db {
       template<typename DB>
       const T& operator()(const DB& db)const { return db.get(*this); }
 
-      friend bool  operator != ( const object_id& a, const object_id& b )
-      {
-         return a.instance != b.instance;
-      }
-      friend bool  operator != ( const object_id_type& a, const object_id& b )
-      {
-         return a != object_id_type(b);
-      }
-      friend bool  operator != ( const object_id& a, const object_id_type& b )
-      {
-         return object_id_type(a) != b;
-      }
+      friend bool  operator == ( const object_id& a, const object_id& b ) { return a.instance == b.instance; }
+      friend bool  operator != ( const object_id& a, const object_id& b ) { return a.instance != b.instance; }
+      friend bool  operator == ( const object_id_type& a, const object_id& b ) { return a == object_id_type(b); }
+      friend bool  operator != ( const object_id_type& a, const object_id& b ) { return a != object_id_type(b); }
+      friend bool  operator == ( const object_id& b, const object_id_type& a ) { return a == object_id_type(b); }
+      friend bool  operator != ( const object_id& b, const object_id_type& a ) { return a != object_id_type(b); }
 
+      friend bool  operator < ( const object_id& a, const object_id& b ) { return a.instance.value < b.instance.value; }
+      friend bool  operator > ( const object_id& a, const object_id& b ) { return a.instance.value > b.instance.value; }
 
-      friend bool  operator == ( const object_id& a, const object_id& b )
-      {
-         return a.instance == b.instance;
-      }
-      friend bool  operator == ( const object_id_type& a, const object_id& b )
-      {
-         return a == object_id_type(b);
-      }
-      friend bool  operator == ( const object_id& b, const object_id_type& a )
-      {
-         return a == object_id_type(b);
-      }
-      friend bool  operator < ( const object_id& a, const object_id& b )
-      {
-         return a.instance.value < b.instance.value;
-      }
-      friend bool  operator > ( const object_id& a, const object_id& b )
-      {
-         return a.instance.value > b.instance.value;
-      }
       friend size_t hash_value( object_id v ) { return std::hash<uint64_t>()(v.instance.value); }
 
       unsigned_int instance;