diff --git a/src/ObjCommon/Csv/ParsedCsv.h b/src/ObjCommon/Csv/ParsedCsv.h
index ff2030d3..358a4ee8 100644
--- a/src/ObjCommon/Csv/ParsedCsv.h
+++ b/src/ObjCommon/Csv/ParsedCsv.h
@@ -1,7 +1,8 @@
 #pragma once
+#include "Csv/CsvStream.h"
+
 #include <sstream>
 #include <unordered_map>
-#include "Csv/CsvStream.h"
 
 class ParsedCsvRow
 {
diff --git a/src/ObjCommon/Sound/FlacDecoder.cpp b/src/ObjCommon/Sound/FlacDecoder.cpp
index ccaad5b0..335a8b70 100644
--- a/src/ObjCommon/Sound/FlacDecoder.cpp
+++ b/src/ObjCommon/Sound/FlacDecoder.cpp
@@ -1,6 +1,7 @@
-#include <foxen/flac.h>
 #include "FlacDecoder.h"
 
+#include <foxen/flac.h>
+
 class fx_flac_raii
 {
 public:
@@ -14,12 +15,12 @@ public:
         free(ptr);
     }
 
-    operator fx_flac_t* ()
+    operator fx_flac_t*()
     {
         return ptr;
     }
 
-private: 
+private:
     fx_flac_t* ptr;
 };
 
@@ -35,7 +36,6 @@ public:
         : m_data(data),
           m_length(length)
     {
-
     }
 
     unsigned int GetFrameCount() override
@@ -48,7 +48,7 @@ public:
         return static_cast<unsigned int>(fx_flac_get_streaminfo(*m_flac.get(), FLAC_KEY_SAMPLE_RATE));
     }
 
-    unsigned int GetNumChannels() override 
+    unsigned int GetNumChannels() override
     {
         return static_cast<unsigned int>(fx_flac_get_streaminfo(*m_flac.get(), FLAC_KEY_N_CHANNELS));
     }
diff --git a/src/ObjCommon/Sound/FlacDecoder.h b/src/ObjCommon/Sound/FlacDecoder.h
index 1d6a46d0..136fc68f 100644
--- a/src/ObjCommon/Sound/FlacDecoder.h
+++ b/src/ObjCommon/Sound/FlacDecoder.h
@@ -18,4 +18,4 @@ public:
     virtual unsigned int GetNumChannels() = 0;
 
     static std::unique_ptr<FlacDecoder> Create(void* data, size_t length);
-};
\ No newline at end of file
+};
diff --git a/src/ObjWriting/Sound/WavWriter.h b/src/ObjWriting/Sound/WavWriter.h
index 4ce2bbc5..c3bda89f 100644
--- a/src/ObjWriting/Sound/WavWriter.h
+++ b/src/ObjWriting/Sound/WavWriter.h
@@ -1,7 +1,8 @@
 #pragma once
-#include <ostream>
 #include "Sound/WavTypes.h"
 
+#include <ostream>
+
 class WavWriter
 {
 public: