diff --git a/src/ustreamer/xioctl.h b/src/libs/xioctl.h
similarity index 90%
rename from src/ustreamer/xioctl.h
rename to src/libs/xioctl.h
index 31e82ed..07b17e1 100644
--- a/src/ustreamer/xioctl.h
+++ b/src/libs/xioctl.h
@@ -26,8 +26,7 @@
 
 #include <sys/ioctl.h>
 
-#include "../libs/tools.h"
-#include "../libs/logging.h"
+#include "tools.h"
 
 
 #ifndef CFG_XIOCTL_RETRIES
@@ -51,10 +50,5 @@ INLINE int xioctl(int fd, int request, void *arg) {
 			|| errno == ETIMEDOUT
 		)
 	);
-
-	// cppcheck-suppress knownConditionTrueFalse
-	if (retval && retries <= 0) {
-		LOG_PERROR("ioctl(%d) retried %u times; giving up", request, XIOCTL_RETRIES);
-	}
 	return retval;
 }
diff --git a/src/ustreamer/device.h b/src/ustreamer/device.h
index 63a8bc9..4c212f8 100644
--- a/src/ustreamer/device.h
+++ b/src/ustreamer/device.h
@@ -45,8 +45,7 @@
 #include "../libs/logging.h"
 #include "../libs/threading.h"
 #include "../libs/frame.h"
-
-#include "xioctl.h"
+#include "../libs/xioctl.h"
 
 
 #define VIDEO_MIN_WIDTH		((unsigned)160)
diff --git a/src/ustreamer/m2m.h b/src/ustreamer/m2m.h
index d8577fb..4b0b068 100644
--- a/src/ustreamer/m2m.h
+++ b/src/ustreamer/m2m.h
@@ -39,8 +39,7 @@
 #include "../libs/tools.h"
 #include "../libs/logging.h"
 #include "../libs/frame.h"
-
-#include "xioctl.h"
+#include "../libs/xioctl.h"
 
 
 typedef struct {