diff --git a/src/AudioStream.c b/src/AudioStream.c
index 0b287b0..c93b9ad 100644
--- a/src/AudioStream.c
+++ b/src/AudioStream.c
@@ -1,8 +1,4 @@
 #include "Limelight-internal.h"
-#include "PlatformSockets.h"
-#include "PlatformThreads.h"
-#include "LinkedBlockingQueue.h"
-#include "RtpReorderQueue.h"
 
 static SOCKET rtpSocket = INVALID_SOCKET;
 
diff --git a/src/Connection.c b/src/Connection.c
index 274d5a9..e41b790 100644
--- a/src/Connection.c
+++ b/src/Connection.c
@@ -1,5 +1,4 @@
 #include "Limelight-internal.h"
-#include "Platform.h"
 
 static int stage = STAGE_NONE;
 static ConnListenerConnectionTerminated originalTerminationCallback;
diff --git a/src/ControlStream.c b/src/ControlStream.c
index 6f7e7cf..5a00c79 100644
--- a/src/ControlStream.c
+++ b/src/ControlStream.c
@@ -1,10 +1,4 @@
 #include "Limelight-internal.h"
-#include "PlatformSockets.h"
-#include "PlatformThreads.h"
-
-#include "ByteBuffer.h"
-
-#include <enet/enet.h>
 
 // NV control stream packet header for TCP
 typedef struct _NVCTL_TCP_PACKET_HEADER {
diff --git a/src/InputStream.c b/src/InputStream.c
index 1adf9c5..07dfb25 100644
--- a/src/InputStream.c
+++ b/src/InputStream.c
@@ -1,8 +1,4 @@
 #include "Limelight-internal.h"
-#include "PlatformSockets.h"
-#include "PlatformThreads.h"
-#include "LinkedBlockingQueue.h"
-#include "Input.h"
 
 static SOCKET inputSock = INVALID_SOCKET;
 static unsigned char currentAesIv[16];
diff --git a/src/Limelight-internal.h b/src/Limelight-internal.h
index 501c079..af816a5 100644
--- a/src/Limelight-internal.h
+++ b/src/Limelight-internal.h
@@ -1,12 +1,15 @@
 #pragma once
 
-#include "Limelight.h"
 #include "Platform.h"
+#include "Limelight.h"
 #include "PlatformSockets.h"
 #include "PlatformThreads.h"
 #include "PlatformCrypto.h"
 #include "Video.h"
+#include "Input.h"
 #include "RtpFecQueue.h"
+#include "RtpReorderQueue.h"
+#include "ByteBuffer.h"
 
 #include <enet/enet.h>
 
diff --git a/src/Platform.c b/src/Platform.c
index c0f4a26..2ecd2d2 100644
--- a/src/Platform.c
+++ b/src/Platform.c
@@ -1,10 +1,4 @@
-#define _GNU_SOURCE
-
-#include "Platform.h"
-#include "PlatformThreads.h"
-#include "PlatformSockets.h"
-
-#include <enet/enet.h>
+#include "Limelight-internal.h"
 
 // The maximum amount of time before observing an interrupt
 // in PltSleepMsInterruptible().
diff --git a/src/Platform.h b/src/Platform.h
index 873d060..b95b74c 100644
--- a/src/Platform.h
+++ b/src/Platform.h
@@ -25,6 +25,7 @@
 #include <netinet/in.h>
 #include <psp2/kernel/threadmgr.h>
 #else
+#define _GNU_SOURCE
 #include <unistd.h>
 #include <pthread.h>
 #include <sys/time.h>
diff --git a/src/PlatformSockets.c b/src/PlatformSockets.c
index 97cc7eb..590ea9d 100644
--- a/src/PlatformSockets.c
+++ b/src/PlatformSockets.c
@@ -1,4 +1,3 @@
-#include "PlatformSockets.h"
 #include "Limelight-internal.h"
 
 #define TEST_PORT_TIMEOUT_SEC 3
diff --git a/src/RtpFecQueue.c b/src/RtpFecQueue.c
index 3c90529..eb0f6f3 100644
--- a/src/RtpFecQueue.c
+++ b/src/RtpFecQueue.c
@@ -1,5 +1,4 @@
 #include "Limelight-internal.h"
-#include "RtpFecQueue.h"
 #include "rs.h"
 
 #ifdef LC_DEBUG
diff --git a/src/RtpReorderQueue.c b/src/RtpReorderQueue.c
index 78a504b..26e21c9 100644
--- a/src/RtpReorderQueue.c
+++ b/src/RtpReorderQueue.c
@@ -1,5 +1,4 @@
 #include "Limelight-internal.h"
-#include "RtpReorderQueue.h"
 
 void RtpqInitializeQueue(PRTP_REORDER_QUEUE queue, int maxSize, int maxQueueTimeMs) {
     memset(queue, 0, sizeof(*queue));
diff --git a/src/RtspConnection.c b/src/RtspConnection.c
index 696b344..64f6a1f 100644
--- a/src/RtspConnection.c
+++ b/src/RtspConnection.c
@@ -1,8 +1,6 @@
 #include "Limelight-internal.h"
 #include "Rtsp.h"
 
-#include <enet/enet.h>
-
 #define RTSP_TIMEOUT_SEC 10
 #define RTSP_RETRY_DELAY_MS 500
 
diff --git a/src/VideoDepacketizer.c b/src/VideoDepacketizer.c
index 68dca9d..80f7457 100644
--- a/src/VideoDepacketizer.c
+++ b/src/VideoDepacketizer.c
@@ -1,7 +1,4 @@
-#include "Platform.h"
 #include "Limelight-internal.h"
-#include "LinkedBlockingQueue.h"
-#include "Video.h"
 
 static PLENTRY nalChainHead;
 static PLENTRY nalChainTail;
diff --git a/src/VideoStream.c b/src/VideoStream.c
index 4d228b9..a9fd7ab 100644
--- a/src/VideoStream.c
+++ b/src/VideoStream.c
@@ -1,7 +1,4 @@
 #include "Limelight-internal.h"
-#include "PlatformSockets.h"
-#include "PlatformThreads.h"
-#include "RtpFecQueue.h"
 
 #define FIRST_FRAME_MAX 1500
 #define FIRST_FRAME_TIMEOUT_SEC 10