diff --git a/src/gui/control/card_list.hpp b/src/gui/control/card_list.hpp
index 012d3ff1..01985dbe 100644
--- a/src/gui/control/card_list.hpp
+++ b/src/gui/control/card_list.hpp
@@ -20,8 +20,8 @@ class CardListBase;
 
 // ----------------------------------------------------------------------------- : Events
 
-DECLARE_EVENT_TYPE(EVENT_CARD_SELECT,   <not used>)
-DECLARE_EVENT_TYPE(EVENT_CARD_ACTIVATE, <not used>)
+DECLARE_LOCAL_EVENT_TYPE(EVENT_CARD_SELECT,   <not used>)
+DECLARE_LOCAL_EVENT_TYPE(EVENT_CARD_ACTIVATE, <not used>)
 
 /// Handle EVENT_CARD_SELECT events
 #define EVT_CARD_SELECT(id, handler)										\
diff --git a/src/gui/control/card_viewer.hpp b/src/gui/control/card_viewer.hpp
index 47019d61..316c3f6a 100644
--- a/src/gui/control/card_viewer.hpp
+++ b/src/gui/control/card_viewer.hpp
@@ -15,7 +15,7 @@
 // ----------------------------------------------------------------------------- : Events
 
 /// Event that indicates the size of a CardViewer has changed
-DECLARE_EVENT_TYPE(EVENT_SIZE_CHANGE, <not used>)
+DECLARE_LOCAL_EVENT_TYPE(EVENT_SIZE_CHANGE, <not used>)
 /// Handle EVENT_SIZE_CHANGE events
 #define EVT_SIZE_CHANGE(id, handler) EVT_COMMAND(id, EVENT_SIZE_CHANGE, handler)
 
diff --git a/src/gui/control/gallery_list.hpp b/src/gui/control/gallery_list.hpp
index 39d701d2..1e70b9f4 100644
--- a/src/gui/control/gallery_list.hpp
+++ b/src/gui/control/gallery_list.hpp
@@ -14,8 +14,8 @@
 
 // ----------------------------------------------------------------------------- : Events
 
-DECLARE_EVENT_TYPE(EVENT_GALLERY_SELECT,   <not used>)
-DECLARE_EVENT_TYPE(EVENT_GALLERY_ACTIVATE, <not used>)
+DECLARE_LOCAL_EVENT_TYPE(EVENT_GALLERY_SELECT,   <not used>)
+DECLARE_LOCAL_EVENT_TYPE(EVENT_GALLERY_ACTIVATE, <not used>)
 
 /// Handle EVENT_GALLERY_SELECT events
 #define EVT_GALLERY_SELECT(  id, handler) EVT_COMMAND(id, EVENT_GALLERY_SELECT,   handler)
diff --git a/src/gui/control/graph.hpp b/src/gui/control/graph.hpp
index 9bd4329f..69f688c4 100644
--- a/src/gui/control/graph.hpp
+++ b/src/gui/control/graph.hpp
@@ -22,7 +22,7 @@ DECLARE_POINTER_TYPE(Graph);
 // ----------------------------------------------------------------------------- : Events
 
 /// Event that indicates the a subset is selected/deselected in a graph
-DECLARE_EVENT_TYPE(EVENT_GRAPH_SELECT, <not used>)
+DECLARE_LOCAL_EVENT_TYPE(EVENT_GRAPH_SELECT, <not used>)
 /// Handle EVENT_GRAPH_SELECT events
 #define EVT_GRAPH_SELECT(id, handler) EVT_COMMAND(id, EVENT_GRAPH_SELECT, handler)
 
diff --git a/src/gui/control/keyword_list.hpp b/src/gui/control/keyword_list.hpp
index d041c884..347aad9f 100644
--- a/src/gui/control/keyword_list.hpp
+++ b/src/gui/control/keyword_list.hpp
@@ -19,7 +19,7 @@ typedef intrusive_ptr<Filter<Keyword> > KeywordListFilterP;
 
 // ----------------------------------------------------------------------------- : Events
 
-DECLARE_EVENT_TYPE(EVENT_KEYWORD_SELECT, <not used>)
+DECLARE_LOCAL_EVENT_TYPE(EVENT_KEYWORD_SELECT, <not used>)
 /// Handle KeywordSelectEvents
 #define EVT_KEYWORD_SELECT(id, handler)										\
 	DECLARE_EVENT_TABLE_ENTRY(EVENT_KEYWORD_SELECT, id, -1,					\
diff --git a/src/gui/symbol/part_list.hpp b/src/gui/symbol/part_list.hpp
index 3e85a05b..db2538a6 100644
--- a/src/gui/symbol/part_list.hpp
+++ b/src/gui/symbol/part_list.hpp
@@ -17,8 +17,8 @@ class SymbolPartsSelection;
 
 // ----------------------------------------------------------------------------- : Events
 
-DECLARE_EVENT_TYPE(EVENT_PART_SELECT,   <not used>)
-DECLARE_EVENT_TYPE(EVENT_PART_ACTIVATE, <not used>)
+DECLARE_LOCAL_EVENT_TYPE(EVENT_PART_SELECT,   <not used>)
+DECLARE_LOCAL_EVENT_TYPE(EVENT_PART_ACTIVATE, <not used>)
 
 /// Handle EVENT_PART_SELECT events
 #define EVT_PART_SELECT(  id, handler) EVT_COMMAND(id, EVENT_PART_SELECT,   handler)