diff --git a/.bzrignore b/.bzrignore
new file mode 100644
index 0000000000..30ee9131a6
--- /dev/null
+++ b/.bzrignore
@@ -0,0 +1,3 @@
+eeschema/cmp_library_base.cpp
+eeschema/cmp_library_base.h
+pcbnew/dialog_freeroute_exchange_help_html.h
diff --git a/eeschema/dialog_schematic_find.h b/eeschema/dialog_schematic_find.h
index b6b44e7844..4dc9adaf89 100644
--- a/eeschema/dialog_schematic_find.h
+++ b/eeschema/dialog_schematic_find.h
@@ -74,8 +74,8 @@ public:
 
 
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE( EVT_COMMAND_FIND_DRC_MARKER, wxID_HIGHEST + 5000 )
-    DECLARE_EVENT_TYPE( EVT_COMMAND_FIND_COMPONENT_IN_LIB, wxID_HIGHEST + 5001 )
+    DECLARE_LOCAL_EVENT_TYPE( EVT_COMMAND_FIND_DRC_MARKER, wxID_ANY )
+    DECLARE_LOCAL_EVENT_TYPE( EVT_COMMAND_FIND_COMPONENT_IN_LIB, wxID_ANY )
 END_DECLARE_EVENT_TYPES()