diff --git a/boards/bitcraze/crazyflie/syslink/CMakeLists.txt b/boards/bitcraze/crazyflie/syslink/CMakeLists.txt
index fa6942a179..ebf6c04c08 100644
--- a/boards/bitcraze/crazyflie/syslink/CMakeLists.txt
+++ b/boards/bitcraze/crazyflie/syslink/CMakeLists.txt
@@ -37,6 +37,7 @@ px4_add_module(
 	COMPILE_FLAGS
 		-Wno-cast-align # TODO: fix and enable
 	SRCS
+		ringbuffer.cpp
 		syslink_main.cpp
 		syslink_bridge.cpp
 		syslink_memory.cpp
diff --git a/src/lib/drivers/device/ringbuffer.cpp b/boards/bitcraze/crazyflie/syslink/ringbuffer.cpp
similarity index 100%
rename from src/lib/drivers/device/ringbuffer.cpp
rename to boards/bitcraze/crazyflie/syslink/ringbuffer.cpp
diff --git a/src/lib/drivers/device/ringbuffer.h b/boards/bitcraze/crazyflie/syslink/ringbuffer.h
similarity index 100%
rename from src/lib/drivers/device/ringbuffer.h
rename to boards/bitcraze/crazyflie/syslink/ringbuffer.h
diff --git a/boards/bitcraze/crazyflie/syslink/syslink_main.h b/boards/bitcraze/crazyflie/syslink/syslink_main.h
index 8babf288f2..875aa0347d 100644
--- a/boards/bitcraze/crazyflie/syslink/syslink_main.h
+++ b/boards/bitcraze/crazyflie/syslink/syslink_main.h
@@ -38,7 +38,7 @@
 #include <battery/battery.h>
 
 #include <drivers/device/device.h>
-#include <drivers/device/ringbuffer.h>
+#include "ringbuffer.h"
 
 #include <uORB/PublicationMulti.hpp>
 #include <uORB/topics/parameter_update.h>
diff --git a/src/drivers/camera_capture/camera_capture.cpp b/src/drivers/camera_capture/camera_capture.cpp
index 598fcfd54e..6c350ddc23 100644
--- a/src/drivers/camera_capture/camera_capture.cpp
+++ b/src/drivers/camera_capture/camera_capture.cpp
@@ -68,9 +68,6 @@ CameraCapture::CameraCapture() :
 
 CameraCapture::~CameraCapture()
 {
-	/* free any existing reports */
-	delete _trig_buffer;
-
 	camera_capture::g_camera_capture = nullptr;
 }
 
@@ -295,13 +292,6 @@ CameraCapture::reset_statistics(bool reset_seq)
 int
 CameraCapture::start()
 {
-	/* allocate basic report buffers */
-	_trig_buffer = new ringbuffer::RingBuffer(2, sizeof(_trig_s));
-
-	if (_trig_buffer == nullptr) {
-		return PX4_ERROR;
-	}
-
 	// run every 100 ms (10 Hz)
 	ScheduleOnInterval(100000, 10000);
 
diff --git a/src/drivers/camera_capture/camera_capture.hpp b/src/drivers/camera_capture/camera_capture.hpp
index 5296aa666e..2bdb31761e 100644
--- a/src/drivers/camera_capture/camera_capture.hpp
+++ b/src/drivers/camera_capture/camera_capture.hpp
@@ -38,7 +38,6 @@
 
 #pragma once
 
-#include <drivers/device/ringbuffer.h>
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_input_capture.h>
 #include <drivers/drv_pwm_output.h>
@@ -115,8 +114,6 @@ private:
 		uint32_t overflow;
 	} _trigger{};
 
-	ringbuffer::RingBuffer	*_trig_buffer{nullptr};
-
 	bool			_capture_enabled{false};
 	bool			_gpio_capture{false};
 
diff --git a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
index 2c115ce784..75e69d1cc0 100644
--- a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
+++ b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
@@ -56,7 +56,6 @@
 #include <containers/Array.hpp>
 #include <drivers/device/device.h>
 #include <drivers/device/i2c.h>
-#include <drivers/device/ringbuffer.h>
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_range_finder.h>
 #include <perf/perf_counter.h>
diff --git a/src/drivers/optical_flow/px4flow/px4flow.cpp b/src/drivers/optical_flow/px4flow/px4flow.cpp
index 9111bf7a92..898c4d6e3e 100644
--- a/src/drivers/optical_flow/px4flow/px4flow.cpp
+++ b/src/drivers/optical_flow/px4flow/px4flow.cpp
@@ -40,7 +40,6 @@
  */
 
 #include <drivers/device/i2c.h>
-#include <drivers/device/ringbuffer.h>
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_range_finder.h>
 #include <lib/conversion/rotation.h>
diff --git a/src/lib/drivers/airspeed/airspeed.cpp b/src/lib/drivers/airspeed/airspeed.cpp
index 70d1ffef1f..556f1ceda7 100644
--- a/src/lib/drivers/airspeed/airspeed.cpp
+++ b/src/lib/drivers/airspeed/airspeed.cpp
@@ -49,7 +49,6 @@
 
 #include <drivers/drv_airspeed.h>
 #include <drivers/drv_hrt.h>
-#include <drivers/device/ringbuffer.h>
 
 #include <uORB/uORB.h>
 #include <uORB/topics/differential_pressure.h>
diff --git a/src/lib/drivers/device/CMakeLists.txt b/src/lib/drivers/device/CMakeLists.txt
index cdd1f1c035..651a0e97ae 100644
--- a/src/lib/drivers/device/CMakeLists.txt
+++ b/src/lib/drivers/device/CMakeLists.txt
@@ -55,7 +55,6 @@ endif()
 
 px4_add_library(drivers__device
 	CDev.cpp
-	ringbuffer.cpp
 	${SRCS_PLATFORM}
 	)