diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp
index abe6d8a592d6..e43ec70fe3e4 100644
--- a/src/libcamera/pipeline/ipu3/cio2.cpp
+++ b/src/libcamera/pipeline/ipu3/cio2.cpp
@@ -300,9 +300,7 @@ void CIO2Device::tryReturnBuffer(FrameBuffer *buffer)
 
 void CIO2Device::freeBuffers()
 {
-	/* The default std::queue constructor is explicit with gcc 5 and 6. */
-	availableBuffers_ = std::queue<FrameBuffer *>{};
-
+	availableBuffers_ = {};
 	buffers_.clear();
 
 	if (output_->releaseBuffers())
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index eeaf335cbcd2..b8f0549f0c60 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -848,9 +848,8 @@ void PipelineHandlerRPi::stop(Camera *camera)
 
 	/* This also stops the streams. */
 	data->clearIncompleteRequests();
-	/* The default std::queue constructor is explicit with gcc 5 and 6. */
-	data->bayerQueue_ = std::queue<FrameBuffer *>{};
-	data->embeddedQueue_ = std::queue<FrameBuffer *>{};
+	data->bayerQueue_ = {};
+	data->embeddedQueue_ = {};
 
 	/* Stop the IPA. */
 	data->ipa_->stop();