Index: uspace/lib/usbdev/src/pipes.c
===================================================================
--- uspace/lib/usbdev/src/pipes.c	(revision c04694225847fe76bcfe2b89afb571f88d5da9da)
+++ uspace/lib/usbdev/src/pipes.c	(revision 277ff98f1f6a1813dcfb5789838b012e679daf11)
@@ -35,8 +35,6 @@
 #include <usb_iface.h>
 #include <usb/dev/pipes.h>
-#include <usb/dev.h>
 #include <errno.h>
 #include <assert.h>
-#include "pipepriv.h"
 
 /** Tell USB interface assigned to given device.
@@ -78,5 +76,4 @@
 void usb_pipe_start_long_transfer(usb_pipe_t *pipe)
 {
-	(void) pipe_add_ref(pipe, true);
 }
 
@@ -89,5 +86,4 @@
 void usb_pipe_end_long_transfer(usb_pipe_t *pipe)
 {
-	pipe_drop_ref(pipe);
 }
 
Index: uspace/lib/usbdev/src/pipesinit.c
===================================================================
--- uspace/lib/usbdev/src/pipesinit.c	(revision c04694225847fe76bcfe2b89afb571f88d5da9da)
+++ uspace/lib/usbdev/src/pipesinit.c	(revision 277ff98f1f6a1813dcfb5789838b012e679daf11)
@@ -371,7 +371,6 @@
 	assert(connection);
 
-	int rc = usb_pipe_initialize(pipe, connection,
-	    0, USB_TRANSFER_CONTROL, CTRL_PIPE_MIN_PACKET_SIZE,
-	    USB_DIRECTION_BOTH);
+	int rc = usb_pipe_initialize(pipe, connection, 0, USB_TRANSFER_CONTROL,
+	    CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH);
 
 	pipe->auto_reset_halt = true;
Index: uspace/lib/usbdev/src/pipesio.c
===================================================================
--- uspace/lib/usbdev/src/pipesio.c	(revision c04694225847fe76bcfe2b89afb571f88d5da9da)
+++ uspace/lib/usbdev/src/pipesio.c	(revision 277ff98f1f6a1813dcfb5789838b012e679daf11)
@@ -45,12 +45,8 @@
  */
 
-#include <usb/usb.h>
 #include <usb/dev/pipes.h>
 #include <errno.h>
 #include <assert.h>
-#include <usbhc_iface.h>
 #include <usb/dev/request.h>
-#include <async.h>
-#include "pipepriv.h"
 
 /** Request an in transfer, no checking of input parameters.