diff --git a/Libraries/LibAudio/AClientConnection.cpp b/Libraries/LibAudio/AClientConnection.cpp
index 5d2abd5935..8bf83c1db1 100644
--- a/Libraries/LibAudio/AClientConnection.cpp
+++ b/Libraries/LibAudio/AClientConnection.cpp
@@ -1,6 +1,6 @@
-#include <SharedBuffer.h>
 #include <LibAudio/ABuffer.h>
-#include "AClientConnection.h"
+#include <LibAudio/AClientConnection.h>
+#include <SharedBuffer.h>
 
 AClientConnection::AClientConnection()
     : Connection("/tmp/asportal")
diff --git a/Libraries/LibAudio/AClientConnection.h b/Libraries/LibAudio/AClientConnection.h
index 312b8a22b5..9f42538903 100644
--- a/Libraries/LibAudio/AClientConnection.h
+++ b/Libraries/LibAudio/AClientConnection.h
@@ -1,16 +1,15 @@
 #pragma once
 
-#include <LibCore/CLocalSocket.h>
-#include <LibCore/CNotifier.h>
-#include <LibCore/CoreIPCClient.h>
 #include <LibAudio/ASAPI.h>
+#include <LibCore/CoreIPCClient.h>
 
 class ABuffer;
 
 class AClientConnection : public IPC::Client::Connection<ASAPI_ServerMessage, ASAPI_ClientMessage> {
+    C_OBJECT(AClientConnection)
 public:
     AClientConnection();
 
-    void handshake() override;
-    void play(const ABuffer& buffer);
+    virtual void handshake() override;
+    void play(const ABuffer&);
 };
diff --git a/Libraries/LibAudio/AWavLoader.cpp b/Libraries/LibAudio/AWavLoader.cpp
index 6d68f79330..6222401cc5 100644
--- a/Libraries/LibAudio/AWavLoader.cpp
+++ b/Libraries/LibAudio/AWavLoader.cpp
@@ -1,10 +1,9 @@
-#include <LibCore/CFile.h>
 #include <AK/BufferStream.h>
+#include <LibAudio/ABuffer.h>
+#include <LibAudio/AWavLoader.h>
+#include <LibCore/CFile.h>
 #include <limits>
 
-#include "AWavLoader.h"
-#include "ABuffer.h"
-
 RefPtr<ABuffer> AWavLoader::load_wav(const StringView& path)
 {
     m_error_string = {};
@@ -24,64 +23,75 @@ RefPtr<ABuffer> AWavLoader::parse_wav(ByteBuffer& buffer)
 {
     BufferStream stream(buffer);
 
-#define CHECK_OK(msg)                      \
-    do {                                   \
-        ASSERT(ok);                        \
-        if (stream.handle_read_failure()) { \
+#define CHECK_OK(msg)                                                           \
+    do {                                                                        \
+        ASSERT(ok);                                                             \
+        if (stream.handle_read_failure()) {                                     \
             m_error_string = String::format("Premature stream EOF at %s", msg); \
-            return {}; \
-        } \
-        if (!ok) {                         \
-            m_error_string = String::format("Parsing failed: %s", msg); \
-            return {};                     \
-        } else {                           \
-            dbgprintf("%s is OK!\n", msg); \
-        }                                  \
+            return {};                                                          \
+        }                                                                       \
+        if (!ok) {                                                              \
+            m_error_string = String::format("Parsing failed: %s", msg);         \
+            return {};                                                          \
+        } else {                                                                \
+            dbgprintf("%s is OK!\n", msg);                                      \
+        }                                                                       \
     } while (0);
 
     bool ok = true;
-    u32 riff; stream >> riff;
+    u32 riff;
+    stream >> riff;
     ok = ok && riff == 0x46464952; // "RIFF"
     CHECK_OK("RIFF header");
 
-    u32 sz; stream >> sz;
+    u32 sz;
+    stream >> sz;
     ok = ok && sz < 1024 * 1024 * 42; // arbitrary
     CHECK_OK("File size");
     ASSERT(sz < 1024 * 1024 * 42);
 
-    u32 wave; stream >> wave;
+    u32 wave;
+    stream >> wave;
     ok = ok && wave == 0x45564157; // "WAVE"
     CHECK_OK("WAVE header");
 
-    u32 fmt_id; stream >> fmt_id;
+    u32 fmt_id;
+    stream >> fmt_id;
     ok = ok && fmt_id == 0x20746D66; // "FMT"
     CHECK_OK("FMT header");
 
-    u32 fmt_size; stream >> fmt_size;
+    u32 fmt_size;
+    stream >> fmt_size;
     ok = ok && fmt_size == 16;
     CHECK_OK("FMT size");
     ASSERT(fmt_size == 16);
 
-    u16 audio_format; stream >> audio_format;
-    CHECK_OK("Audio format"); // incomplete read check
+    u16 audio_format;
+    stream >> audio_format;
+    CHECK_OK("Audio format");     // incomplete read check
     ok = ok && audio_format == 1; // WAVE_FORMAT_PCM
     ASSERT(audio_format == 1);
     CHECK_OK("Audio format"); // value check
 
-    u16 num_channels; stream >> num_channels;
+    u16 num_channels;
+    stream >> num_channels;
     ok = ok && (num_channels == 1 || num_channels == 2);
     CHECK_OK("Channel count");
 
-    u32 sample_rate; stream >> sample_rate;
+    u32 sample_rate;
+    stream >> sample_rate;
     CHECK_OK("Sample rate");
 
-    u32 byte_rate; stream >> byte_rate;
+    u32 byte_rate;
+    stream >> byte_rate;
     CHECK_OK("Byte rate");
 
-    u16 block_align; stream >> block_align;
+    u16 block_align;
+    stream >> block_align;
     CHECK_OK("Block align");
 
-    u16 bits_per_sample; stream >> bits_per_sample;
+    u16 bits_per_sample;
+    stream >> bits_per_sample;
     CHECK_OK("Bits per sample"); // incomplete read check
     ok = ok && (bits_per_sample == 8 || bits_per_sample == 16 || bits_per_sample == 24);
     ASSERT(bits_per_sample == 8 || bits_per_sample == 16 || bits_per_sample == 24);
@@ -91,7 +101,8 @@ RefPtr<ABuffer> AWavLoader::parse_wav(ByteBuffer& buffer)
     bool found_data = false;
     u32 data_sz = 0;
     while (true) {
-        u32 chunk_id; stream >> chunk_id;
+        u32 chunk_id;
+        stream >> chunk_id;
         CHECK_OK("Reading chunk ID searching for data");
         stream >> data_sz;
         CHECK_OK("Reading chunk size searching for data");
@@ -130,6 +141,7 @@ public:
     AResampleHelper(float source, float target);
     bool read_sample();
     void prepare();
+
 private:
     const float m_ratio;
     float m_current_ratio { 0 };
@@ -155,7 +167,7 @@ bool AResampleHelper::read_sample()
     return false;
 }
 
-template <typename SampleReader>
+template<typename SampleReader>
 static void read_samples_from_stream(BufferStream& stream, SampleReader read_sample, Vector<ASample>& samples, int num_channels, int source_rate)
 {
     AResampleHelper resampler(source_rate, 44100);
diff --git a/Libraries/LibAudio/AWavLoader.h b/Libraries/LibAudio/AWavLoader.h
index 9e0c7ad2f6..09722bd2f4 100644
--- a/Libraries/LibAudio/AWavLoader.h
+++ b/Libraries/LibAudio/AWavLoader.h
@@ -1,18 +1,22 @@
 #pragma once
 
+#include <AK/AKString.h>
 #include <AK/RefPtr.h>
 #include <AK/StringView.h>
-#include <AK/AKString.h>
 
 class ABuffer;
+
+namespace AK {
 class ByteBuffer;
+}
 
 // Parses a WAV file and produces an ABuffer instance from it
 class AWavLoader {
 public:
     RefPtr<ABuffer> load_wav(const StringView& path);
     const char* error_string() { return m_error_string.characters(); }
+
 private:
-    RefPtr<ABuffer> parse_wav(ByteBuffer& buffer);
+    RefPtr<ABuffer> parse_wav(ByteBuffer&);
     String m_error_string;
 };