diff --git a/src/FPGA/WriteRegistersBatch.cpp b/src/FPGA/WriteRegistersBatch.cpp
index 16870e87..a1cf0b80 100644
--- a/src/FPGA/WriteRegistersBatch.cpp
+++ b/src/FPGA/WriteRegistersBatch.cpp
@@ -7,7 +7,9 @@ using namespace std::literals::string_literals;
 /// @brief Constructor for the batch.
 /// @param fpga The FPGA this batch belongs to.
 WriteRegistersBatch::WriteRegistersBatch(FPGA* fpga)
-    : owner(fpga){};
+    : owner(fpga)
+{
+}
 
 WriteRegistersBatch::~WriteRegistersBatch()
 {
diff --git a/src/boards/LimeSDR_Mini/USB_CSR_Pipe_Mini.cpp b/src/boards/LimeSDR_Mini/USB_CSR_Pipe_Mini.cpp
index a3fae6ff..ee45a224 100644
--- a/src/boards/LimeSDR_Mini/USB_CSR_Pipe_Mini.cpp
+++ b/src/boards/LimeSDR_Mini/USB_CSR_Pipe_Mini.cpp
@@ -9,7 +9,9 @@ static const int CONTROL_BULK_READ_ADDRESS = 0x82;
 
 USB_CSR_Pipe_Mini::USB_CSR_Pipe_Mini(FT601& port)
     : USB_CSR_Pipe()
-    , port(port){};
+    , port(port)
+{
+}
 
 int USB_CSR_Pipe_Mini::Write(const uint8_t* data, size_t length, int timeout_ms)
 {
diff --git a/src/include/limesuiteng/SDRDevice.cpp b/src/include/limesuiteng/SDRDevice.cpp
index 7d713e0d..0d4fb04c 100644
--- a/src/include/limesuiteng/SDRDevice.cpp
+++ b/src/include/limesuiteng/SDRDevice.cpp
@@ -33,7 +33,9 @@ StreamConfig::StreamConfig()
     channels[TRXDir::Tx] = {};
 }
 
-SDRDevice::~SDRDevice(){};
+SDRDevice::~SDRDevice()
+{
+}
 
 OpStatus SDRDevice::UploadTxWaveform(const StreamConfig& config, uint8_t moduleIndex, const void** samples, uint32_t count)
 {
@@ -85,7 +87,9 @@ OpStatus SDRDevice::CustomParameterRead(std::vector<CustomParameterIO>& paramete
     return ReportError(OpStatus::NotImplemented, "CustomParameterRead not implemented"s);
 }
 
-void SDRDevice::SetMessageLogCallback(LogCallbackType callback){};
+void SDRDevice::SetMessageLogCallback(LogCallbackType callback)
+{
+}
 
 OpStatus SDRDevice::UploadMemory(
     eMemoryDevice device, uint8_t moduleIndex, const char* data, size_t length, UploadMemoryCallback callback)
@@ -107,13 +111,13 @@ void SDRDevice::StreamStart(const std::vector<uint8_t>& moduleIndexes)
 {
     for (uint8_t i : moduleIndexes)
         StreamStart(i);
-};
+}
 
 void SDRDevice::StreamStop(const std::vector<uint8_t>& moduleIndexes)
 {
     for (uint8_t i : moduleIndexes)
         StreamStop(i);
-};
+}
 
 OpStatus SDRDevice::OEMTest(OEMTestReporter* reporter)
 {
diff --git a/src/streaming/AvgRmsCounter.cpp b/src/streaming/AvgRmsCounter.cpp
index dd749f20..46975110 100644
--- a/src/streaming/AvgRmsCounter.cpp
+++ b/src/streaming/AvgRmsCounter.cpp
@@ -9,7 +9,9 @@ AvgRmsCounter::AvgRmsCounter()
     , avgAccumulator(0)
     , rmsAccumulator(0)
     , min(1e16)
-    , max(1e-16){};
+    , max(1e-16)
+{
+}
 
 void AvgRmsCounter::Add(double value)
 {
diff --git a/src/utilities/DeltaVariable.h b/src/utilities/DeltaVariable.h
index 59148ae5..47cfdecd 100644
--- a/src/utilities/DeltaVariable.h
+++ b/src/utilities/DeltaVariable.h
@@ -49,4 +49,4 @@ template<class T> class DeltaVariable
     T mLastValue;
 };
 
-}; // namespace lime
+} // namespace lime