Index: uspace/lib/usb/include/usb/host/device_keeper.h
===================================================================
--- uspace/lib/usb/include/usb/host/device_keeper.h	(revision a43f1d1803f452027e7beaecba090ca3e630eb93)
+++ uspace/lib/usb/include/usb/host/device_keeper.h	(revision d32ed36ec8959bf9d7b020cce7db5775359f0f2b)
@@ -71,9 +71,4 @@
 void usb_device_keeper_init(usb_device_keeper_t *instance);
 
-void usb_device_keeper_add_ep(
-    usb_device_keeper_t *instance, usb_address_t address, endpoint_t *ep);
-void usb_device_keeper_del_ep(
-    usb_device_keeper_t *instance, usb_address_t address, endpoint_t *ep);
-
 void usb_device_keeper_reserve_default_address(
     usb_device_keeper_t *instance, usb_speed_t speed);
Index: uspace/lib/usb/include/usb/host/endpoint.h
===================================================================
--- uspace/lib/usb/include/usb/host/endpoint.h	(revision a43f1d1803f452027e7beaecba090ca3e630eb93)
+++ uspace/lib/usb/include/usb/host/endpoint.h	(revision d32ed36ec8959bf9d7b020cce7db5775359f0f2b)
@@ -54,5 +54,4 @@
 	fibril_condvar_t avail;
 	volatile bool active;
-	link_t same_device_eps;
 } endpoint_t;
 
@@ -71,8 +70,5 @@
 void endpoint_toggle_set(endpoint_t *instance, int toggle);
 
-void endpoint_toggle_reset(link_t *ep);
-
-void endpoint_toggle_reset_filtered(link_t *ep, usb_endpoint_t epn);
-
+void endpoint_toggle_reset_filtered(endpoint_t *instance, usb_target_t target);
 #endif
 /**
Index: uspace/lib/usb/include/usb/host/usb_endpoint_manager.h
===================================================================
--- uspace/lib/usb/include/usb/host/usb_endpoint_manager.h	(revision a43f1d1803f452027e7beaecba090ca3e630eb93)
+++ uspace/lib/usb/include/usb/host/usb_endpoint_manager.h	(revision d32ed36ec8959bf9d7b020cce7db5775359f0f2b)
@@ -78,4 +78,6 @@
     size_t *bw);
 
+void usb_endpoint_manager_reset_if_need(
+    usb_endpoint_manager_t *instance, usb_target_t target, const uint8_t *data);
 #endif
 /**