diff --git a/src/misc/bitvect.hh b/src/misc/bitvect.hh
index 4bf4073e4..566039380 100644
--- a/src/misc/bitvect.hh
+++ b/src/misc/bitvect.hh
@@ -467,8 +467,8 @@ namespace spot
     {
     }
 
-    SPOT_LOCAL bitvect_array(const bitvect_array&) SPOT_DELETED;
-    SPOT_LOCAL void operator=(const bitvect_array&) SPOT_DELETED;
+    SPOT_LOCAL bitvect_array(const bitvect_array&) = delete;
+    SPOT_LOCAL void operator=(const bitvect_array&) = delete;
 
     // Extra storage has been allocated at the end of the struct.
     char* storage()
diff --git a/src/misc/common.hh b/src/misc/common.hh
index 478d34308..5a367ae02 100644
--- a/src/misc/common.hh
+++ b/src/misc/common.hh
@@ -75,15 +75,10 @@
 #define SPOT_API_VAR extern SPOT_API
 
 
-// Swig 2.0 does not understand '= delete'.  This already
-// works with the development version of Swig 3.
-// Swig 3.0.2 still does not understand 'final' when used
+// Swig 3.0.2 does not understand 'final' when used
 // at class definition.
 #ifdef SWIG
-  #define SPOT_DELETED
   #define final
-#else
-  #define SPOT_DELETED = delete
 #endif
 
 
diff --git a/src/ta/taexplicit.hh b/src/ta/taexplicit.hh
index 8bc9e4c6f..7e71579f0 100644
--- a/src/ta/taexplicit.hh
+++ b/src/ta/taexplicit.hh
@@ -118,8 +118,8 @@ namespace spot
 
   private:
     // Disallow copy.
-    ta_explicit(const ta_explicit& other) SPOT_DELETED;
-    ta_explicit& operator=(const ta_explicit& other) SPOT_DELETED;
+    ta_explicit(const ta_explicit& other) = delete;
+    ta_explicit& operator=(const ta_explicit& other) = delete;
 
     const_twa_ptr tgba_;
     state_ta_explicit* artificial_initial_state_;
diff --git a/src/ta/taproduct.hh b/src/ta/taproduct.hh
index cb786b285..3c3ca7a61 100644
--- a/src/ta/taproduct.hh
+++ b/src/ta/taproduct.hh
@@ -194,8 +194,8 @@ namespace spot
     const_kripke_ptr kripke_;
 
     // Disallow copy.
-    ta_product(const ta_product&) SPOT_DELETED;
-    ta_product& operator=(const ta_product&) SPOT_DELETED;
+    ta_product(const ta_product&) = delete;
+    ta_product& operator=(const ta_product&) = delete;
   };
 
 
diff --git a/src/tl/simplify.hh b/src/tl/simplify.hh
index 6eff4156f..0afe39673 100644
--- a/src/tl/simplify.hh
+++ b/src/tl/simplify.hh
@@ -195,7 +195,7 @@ namespace spot
   private:
     ltl_simplifier_cache* cache_;
     // Copy disallowed.
-    ltl_simplifier(const ltl_simplifier&) SPOT_DELETED;
-    void operator=(const ltl_simplifier&) SPOT_DELETED;
+    ltl_simplifier(const ltl_simplifier&) = delete;
+    void operator=(const ltl_simplifier&) = delete;
   };
 }
diff --git a/src/twa/bdddict.hh b/src/twa/bdddict.hh
index a430cc9f4..53ccc94a4 100644
--- a/src/twa/bdddict.hh
+++ b/src/twa/bdddict.hh
@@ -309,8 +309,8 @@ namespace spot
 
   private:
     // Disallow copy.
-    bdd_dict(const bdd_dict& other) SPOT_DELETED;
-    bdd_dict& operator=(const bdd_dict& other) SPOT_DELETED;
+    bdd_dict(const bdd_dict& other) = delete;
+    bdd_dict& operator=(const bdd_dict& other) = delete;
   };
 
   typedef std::shared_ptr<bdd_dict> bdd_dict_ptr;
diff --git a/src/twa/taatgba.hh b/src/twa/taatgba.hh
index 6ea3b64d0..efd3c7314 100644
--- a/src/twa/taatgba.hh
+++ b/src/twa/taatgba.hh
@@ -70,8 +70,8 @@ namespace spot
 
   private:
     // Disallow copy.
-    taa_tgba(const taa_tgba& other) SPOT_DELETED;
-    taa_tgba& operator=(const taa_tgba& other) SPOT_DELETED;
+    taa_tgba(const taa_tgba& other) = delete;
+    taa_tgba& operator=(const taa_tgba& other) = delete;
   };
 
   /// Set of states deriving from spot::state.
diff --git a/src/twa/twaproduct.hh b/src/twa/twaproduct.hh
index e94f16da5..72855f2cd 100644
--- a/src/twa/twaproduct.hh
+++ b/src/twa/twaproduct.hh
@@ -114,8 +114,8 @@ namespace spot
 
   private:
     // Disallow copy.
-    twa_product(const twa_product&) SPOT_DELETED;
-    twa_product& operator=(const twa_product&) SPOT_DELETED;
+    twa_product(const twa_product&) = delete;
+    twa_product& operator=(const twa_product&) = delete;
   };
 
   /// \brief A lazy product with different initial states.