diff --git a/src/data/action/symbol.hpp b/src/data/action/symbol.hpp
index ba63634a..ec2cf513 100644
--- a/src/data/action/symbol.hpp
+++ b/src/data/action/symbol.hpp
@@ -162,7 +162,7 @@ public:
   
 private:
   void add(const SymbolPartP&, SymbolShapeCombine mode);
-  vector<pair<SymbolShapeP,SymbolShapeCombine> > parts;  ///< Affected parts with new combining modes
+  vector<pair<SymbolShapeP,SymbolShapeCombine>> parts;  ///< Affected parts with new combining modes
 };
 
 // ----------------------------------------------------------------------------- : Change name
@@ -243,7 +243,7 @@ public:
 private:
   Symbol& symbol;
   /// Duplicates of parts and their positions, sorted by ascending pos
-  vector<pair<SymbolPartP, size_t> > duplications;
+  vector<pair<SymbolPartP, size_t>> duplications;
 };
 
 
diff --git a/src/data/card.hpp b/src/data/card.hpp
index 8cb5a674..37471725 100644
--- a/src/data/card.hpp
+++ b/src/data/card.hpp
@@ -56,7 +56,7 @@ public:
   IndexMap<FieldP, ValueP>& extraDataFor(const StyleSheet& stylesheet);
   
   /// Keyword usage statistics
-  vector<pair<Value*,const Keyword*> > keyword_usage;
+  vector<pair<Value*,const Keyword*>> keyword_usage;
   
   /// Get the identification of this card, an identification is something like a name, title, etc.
   /** May return "" */
diff --git a/src/data/keyword.hpp b/src/data/keyword.hpp
index a60f7f59..b9d9a4e8 100644
--- a/src/data/keyword.hpp
+++ b/src/data/keyword.hpp
@@ -132,7 +132,7 @@ inline String type_name(const vector<KeywordP>&) {
 // ----------------------------------------------------------------------------- : Using keywords
 
 /// Store keyword usage statistics here, using value_being_updated as the key
-typedef vector<pair<Value*, const Keyword*> > KeywordUsageStatistics;
+typedef vector<pair<Value*, const Keyword*>> KeywordUsageStatistics;
 DECLARE_DYNAMIC_ARG(KeywordUsageStatistics*, keyword_usage_statistics);
 
 /// A database of keywords to allow for fast matching
diff --git a/src/data/set.hpp b/src/data/set.hpp
index 39ca79f4..5f9c74c4 100644
--- a/src/data/set.hpp
+++ b/src/data/set.hpp
@@ -30,7 +30,7 @@ class SetScriptContext;
 class Context;
 class Dependency;
 template <typename> class OrderCache;
-typedef intrusive_ptr<OrderCache<CardP> > OrderCacheP;
+typedef intrusive_ptr<OrderCache<CardP>> OrderCacheP;
 
 // ----------------------------------------------------------------------------- : Set
 
diff --git a/src/gui/control/filter_ctrl.hpp b/src/gui/control/filter_ctrl.hpp
index cd9d36fe..acc4b1a5 100644
--- a/src/gui/control/filter_ctrl.hpp
+++ b/src/gui/control/filter_ctrl.hpp
@@ -32,7 +32,7 @@ public:
     if (hasFilter()) {
       return make_intrusive<QuickFilter<T>>(getFilterString());
     } else {
-      return intrusive_ptr<Filter<T> >();
+      return intrusive_ptr<Filter<T>>();
     }
   }
   
diff --git a/src/gui/control/filtered_card_list.hpp b/src/gui/control/filtered_card_list.hpp
index 517d6f28..9146ccc2 100644
--- a/src/gui/control/filtered_card_list.hpp
+++ b/src/gui/control/filtered_card_list.hpp
@@ -12,7 +12,7 @@
 #include <gui/control/card_list.hpp>
 #include <data/filter.hpp>
 
-typedef intrusive_ptr<Filter<Card> > CardListFilterP;
+typedef intrusive_ptr<Filter<Card>> CardListFilterP;
 
 // ----------------------------------------------------------------------------- : FilteredCardList
 
diff --git a/src/gui/control/graph.hpp b/src/gui/control/graph.hpp
index da5b70e4..749d0471 100644
--- a/src/gui/control/graph.hpp
+++ b/src/gui/control/graph.hpp
@@ -263,7 +263,7 @@ private:
   mutable RealSize size, item_size;
   mutable double label_width;
   Alignment alignment;
-  vector<pair<String,String> > values;
+  vector<pair<String,String>> values;
 };
 
 //class GraphTable {
diff --git a/src/gui/control/keyword_list.hpp b/src/gui/control/keyword_list.hpp
index ae9f6faf..64e848bc 100644
--- a/src/gui/control/keyword_list.hpp
+++ b/src/gui/control/keyword_list.hpp
@@ -14,7 +14,7 @@
 #include <data/filter.hpp>
 #include <data/set.hpp>
 
-typedef intrusive_ptr<Filter<Keyword> > KeywordListFilterP;
+typedef intrusive_ptr<Filter<Keyword>> KeywordListFilterP;
 
 // ----------------------------------------------------------------------------- : Events
 
diff --git a/src/gui/thumbnail_thread.cpp b/src/gui/thumbnail_thread.cpp
index f0d193c7..6ce58f13 100644
--- a/src/gui/thumbnail_thread.cpp
+++ b/src/gui/thumbnail_thread.cpp
@@ -168,7 +168,7 @@ void ThumbnailThread::request(const ThumbnailRequestP& request) {
 bool ThumbnailThread::done(void* owner) {
   assert(wxThread::IsMain());
   // find finished requests
-  vector<pair<ThumbnailRequestP,Image> > finished;
+  vector<pair<ThumbnailRequestP,Image>> finished;
   {
     wxMutexLocker lock(mutex);
     for (size_t i = 0 ; i < closed_requests.size() ; ) {
diff --git a/src/gui/thumbnail_thread.hpp b/src/gui/thumbnail_thread.hpp
index ab5c1fcc..b97fdb21 100644
--- a/src/gui/thumbnail_thread.hpp
+++ b/src/gui/thumbnail_thread.hpp
@@ -70,7 +70,7 @@ private:
   wxCondition completed; ///< Event signaled when a request is completed
   
   deque<ThumbnailRequestP>                open_requests;    ///< Requests on which work hasn't finished
-  vector<pair<ThumbnailRequestP,Image> >  closed_requests;  ///< Requests for which work is completed
+  vector<pair<ThumbnailRequestP,Image>>  closed_requests;  ///< Requests for which work is completed
   set<ThumbnailRequestP>                  request_names;    ///< Requests that haven't been stored yet, to prevent duplicates
   friend class ThumbnailThreadWorker;
   ThumbnailThreadWorker* worker;                ///< The worker thread. invariant: no requests ==> worker==nullptr
diff --git a/src/script/functions/basic.cpp b/src/script/functions/basic.cpp
index e235499d..84936995 100644
--- a/src/script/functions/basic.cpp
+++ b/src/script/functions/basic.cpp
@@ -500,7 +500,7 @@ ScriptValueP sort_script(Context& ctx, const ScriptValueP& list, ScriptValue& or
     // are we sorting a set?
     ScriptObject<Set*>* set = dynamic_cast<ScriptObject<Set*>*>(list.get());
     // sort a collection
-    vector<pair<String,ScriptValueP> > values;
+    vector<pair<String,ScriptValueP>> values;
     ScriptValueP it = list->makeIterator();
     while (ScriptValueP v = it->next()) {
       ctx.setVariable(set ? _("card") : _("input"), v);
diff --git a/src/script/functions/editor.cpp b/src/script/functions/editor.cpp
index bff913c6..e078a09e 100644
--- a/src/script/functions/editor.cpp
+++ b/src/script/functions/editor.cpp
@@ -63,7 +63,7 @@ SCRIPT_FUNCTION_WITH_DEP(combined_editor) {
     value = value.substr(0, pos);
   }
   // split the value
-  vector<pair<String,bool> > value_parts; // (value part, is empty)
+  vector<pair<String,bool>> value_parts; // (value part, is empty)
   pos = value.find(_("<sep"));
   while (pos != String::npos) {
     String part = value.substr(0, pos);
diff --git a/src/script/to_value.hpp b/src/script/to_value.hpp
index 69fa40a2..ebf3b0ab 100644
--- a/src/script/to_value.hpp
+++ b/src/script/to_value.hpp
@@ -354,7 +354,7 @@ public:
   /// The wrapped function
   ScriptValueP                          fun;
   /// The default argument bindings
-  vector<pair<Variable,ScriptValueP> >  bindings;
+  vector<pair<Variable,ScriptValueP>>  bindings;
 
 private:
   /// Apply the bindings in a context
diff --git a/src/util/delayed_index_maps.hpp b/src/util/delayed_index_maps.hpp
index c51c7674..a9e8c96d 100644
--- a/src/util/delayed_index_maps.hpp
+++ b/src/util/delayed_index_maps.hpp
@@ -18,7 +18,7 @@
 
 template <typename Key, typename Value>
 IndexMap<Key,Value>& DelayedIndexMaps<Key,Value>::get(const String& name, const vector<Key>& init_with) {
-  intrusive_ptr<DelayedIndexMapsData<Key,Value> >& item = data[name];
+  intrusive_ptr<DelayedIndexMapsData<Key,Value>>& item = data[name];
   if (!item) { // no item, make a new one
     item = make_intrusive<DelayedIndexMapsData<Key,Value>>();
     item->read_data.init(init_with);
diff --git a/src/util/index_map.hpp b/src/util/index_map.hpp
index b305b3f7..600ed68e 100644
--- a/src/util/index_map.hpp
+++ b/src/util/index_map.hpp
@@ -133,7 +133,7 @@ inline void swap(IndexMap<Key,Value>& a, IndexMap<Key,Value>& b) {
 /* Invariant: read_data is initialized <=> unread_data.empty()
  */
 template <typename Key, typename Value>
-struct DelayedIndexMapsData : public IntrusivePtrBase<DelayedIndexMapsData<Key, Value> > {
+struct DelayedIndexMapsData : public IntrusivePtrBase<DelayedIndexMapsData<Key, Value>> {
   String              unread_data;
   IndexMap<Key,Value> read_data;
 };
@@ -150,7 +150,7 @@ public:
   /// Clear the delayed index map
   void clear();
 private:
-  map<String, intrusive_ptr<DelayedIndexMapsData<Key,Value> > > data;
+  map<String, intrusive_ptr<DelayedIndexMapsData<Key,Value>>> data;
   friend class Reader;
   friend class Writer;
   friend class GetDefaultMember;
diff --git a/src/util/order_cache.hpp b/src/util/order_cache.hpp
index 87e693c9..c36e01e6 100644
--- a/src/util/order_cache.hpp
+++ b/src/util/order_cache.hpp
@@ -15,7 +15,7 @@
 /// Object that cashes an ordered version of a list of items, for finding the position of objects
 /** Can be used as a map "void* -> int" for finding the position of an object */
 template <typename T>
-class OrderCache : public IntrusivePtrBase<OrderCache<T> > {
+class OrderCache : public IntrusivePtrBase<OrderCache<T>> {
 public:
   /// Initialize the order cache, ordering the keys by their string values from the other vector
   /** Optionally filter the list using a vector of booleans of items to keep (note: vector<bool> is evil)