Index: trunk/src_plugins/autoplace/action.c
===================================================================
--- trunk/src_plugins/autoplace/action.c	(revision 1277)
+++ trunk/src_plugins/autoplace/action.c	(revision 1278)
@@ -63,9 +63,14 @@
 
 REGISTER_ACTIONS(autoplace_action_list, autoplace_cookie)
 
+static void hid_autoplace_uninit(void)
+{
+	hid_remove_actions_by_cookie(autoplace_cookie);
+}
+
 #include "dolists.h"
 pcb_uninit_t hid_autoplace_init(void)
 {
 	REGISTER_ACTIONS(autoplace_action_list, autoplace_cookie)
-	return NULL;
+	return hid_autoplace_uninit;
 }
Index: trunk/src_plugins/autoroute/action.c
===================================================================
--- trunk/src_plugins/autoroute/action.c	(revision 1277)
+++ trunk/src_plugins/autoroute/action.c	(revision 1278)
@@ -91,9 +91,14 @@
 
 REGISTER_ACTIONS(autoroute_action_list, autoroute_cookie)
 
+static void hid_autoroute_uninit(void)
+{
+	hid_remove_actions_by_cookie(autoroute_cookie);
+}
+
 #include "dolists.h"
 pcb_uninit_t hid_autoroute_init(void)
 {
 	REGISTER_ACTIONS(autoroute_action_list, autoroute_cookie)
-	return NULL;
+	return hid_autoroute_uninit;
 }
Index: trunk/src_plugins/djopt/djopt.c
===================================================================
--- trunk/src_plugins/djopt/djopt.c	(revision 1277)
+++ trunk/src_plugins/djopt/djopt.c	(revision 1278)
@@ -2719,10 +2719,16 @@
 
 REGISTER_ACTIONS(djopt_action_list, djopt_cookie)
 
+static void hid_djopt_uninit(void)
+{
+	hid_remove_actions_by_cookie(djopt_cookie);
+	hid_remove_flags_by_cookie(djopt_cookie);
+}
+
 #include "dolists.h"
 pcb_uninit_t hid_djopt_init(void)
 {
 	REGISTER_FLAGS(djopt_flag_list, djopt_cookie)
 	REGISTER_ACTIONS(djopt_action_list, djopt_cookie)
-	return NULL;
+	return hid_djopt_uninit;
 }
Index: trunk/src_plugins/import_sch/import_sch.c
===================================================================
--- trunk/src_plugins/import_sch/import_sch.c	(revision 1277)
+++ trunk/src_plugins/import_sch/import_sch.c	(revision 1278)
@@ -429,9 +429,14 @@
 
 REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie)
 
+static void hid_import_sch_uninit(void)
+{
+	hid_remove_actions_by_cookie(import_sch_cookie);
+}
+
 #include "dolists.h"
 pcb_uninit_t hid_import_sch_init(void)
 {
 	REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie)
-	return NULL;
+	return hid_import_sch_uninit;
 }
Index: trunk/src_plugins/oldactions/oldactions.c
===================================================================
--- trunk/src_plugins/oldactions/oldactions.c	(revision 1277)
+++ trunk/src_plugins/oldactions/oldactions.c	(revision 1278)
@@ -95,10 +95,15 @@
 
 REGISTER_ACTIONS(oldactions_action_list, oldactions_cookie)
 
+static void hid_oldactions_uninit(void)
+{
+	hid_remove_actions_by_cookie(oldactions_cookie);
+}
+
 #include "dolists.h"
 pcb_uninit_t hid_oldactions_init(void)
 {
 	REGISTER_ACTIONS(oldactions_action_list, oldactions_cookie)
-	return NULL;
+	return hid_oldactions_uninit;
 }
 
Index: trunk/src_plugins/puller/puller.c
===================================================================
--- trunk/src_plugins/puller/puller.c	(revision 1277)
+++ trunk/src_plugins/puller/puller.c	(revision 1278)
@@ -2390,9 +2390,14 @@
 
 REGISTER_ACTIONS(puller_action_list)
 
+static void hid_puller_uninit(void)
+{
+	hid_remove_actions_by_cookie(puller_cookie);
+}
+
 #include "dolists.h"
 pcb_uninit_t hid_puller_init(void)
 {
 	REGISTER_ACTIONS(puller_action_list)
-	return NULL;
+	return hid_puller_uninit;
 }
Index: trunk/src_plugins/renumber/renumber.c
===================================================================
--- trunk/src_plugins/renumber/renumber.c	(revision 1277)
+++ trunk/src_plugins/renumber/renumber.c	(revision 1278)
@@ -355,6 +355,11 @@
 	 renumber_help, renumber_syntax}
 };
 
+static void hid_renumber_uninit(void)
+{
+	hid_remove_actions_by_cookie(renumber_cookie);
+}
+
 REGISTER_ACTIONS(renumber_action_list, renumber_cookie)
 
 #include "dolists.h"
@@ -361,6 +366,6 @@
 pcb_uninit_t hid_renumber_init(void)
 {
 	REGISTER_ACTIONS(renumber_action_list, renumber_cookie)
-	return NULL;
+	return hid_renumber_uninit;
 }
 
Index: trunk/src_plugins/toporouter/toporouter.c
===================================================================
--- trunk/src_plugins/toporouter/toporouter.c	(revision 1277)
+++ trunk/src_plugins/toporouter/toporouter.c	(revision 1278)
@@ -8234,10 +8234,15 @@
 	{"Toporouter", "Select net(s)", toporouter, "Topological autorouter", "Toporouter()"}
 };
 
-REGISTER_ACTIONS(toporouter_action_list)
+REGISTER_ACTIONS(toporouter_action_list, toporouter_cookie)
 
+static void hid_toporouter_uninit(void)
+{
+	hid_remove_actions_by_cookie(toporouter_cookie);
+}
+
 pcb_uninit_t hid_toporouter_init()
 {
 	register_toporouter_action_list();
-	return NULL;
+	return hid_toporouter_uninit;
 }