Consolidate includes

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;
 

src/Connection.c

@@ -1,5 +1,4 @@
 #include "Limelight-internal.h"
-#include "Platform.h"
 
 static int stage = STAGE_NONE;
 static ConnListenerConnectionTerminated originalTerminationCallback;

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 {

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];

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>
 

src/Platform.c

@@ -1,10 +1,4 @@
-#define _GNU_SOURCE
+#include "Limelight-internal.h"
-
-#include "Platform.h"
-#include "PlatformThreads.h"
-#include "PlatformSockets.h"
-
-#include <enet/enet.h>
 
 // The maximum amount of time before observing an interrupt
 // in PltSleepMsInterruptible().

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>

src/PlatformSockets.c

@@ -1,4 +1,3 @@
-#include "PlatformSockets.h"
 #include "Limelight-internal.h"
 
 #define TEST_PORT_TIMEOUT_SEC 3

src/RtpFecQueue.c

@@ -1,5 +1,4 @@
 #include "Limelight-internal.h"
-#include "RtpFecQueue.h"
 #include "rs.h"
 
 #ifdef LC_DEBUG

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));

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
 

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;

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