diff --git a/common-c.mk b/common-c.mk
index acadea5..9b6da3e 100644
--- a/common-c.mk
+++ b/common-c.mk
@@ -33,8 +33,8 @@ COMMON_C_SOURCE := \
 	$(COMMON_C_DIR)/Platform.c            \
 	$(COMMON_C_DIR)/PlatformCrypto.c      \
 	$(COMMON_C_DIR)/PlatformSockets.c     \
-	$(COMMON_C_DIR)/RtpFecQueue.c         \
-	$(COMMON_C_DIR)/RtpReorderQueue.c     \
+	$(COMMON_C_DIR)/RtpAudioQueue.c       \
+	$(COMMON_C_DIR)/RtpVideoQueue.c       \
 	$(COMMON_C_DIR)/RtspConnection.c      \
 	$(COMMON_C_DIR)/RtspParser.c          \
 	$(COMMON_C_DIR)/SdpGenerator.c        \
diff --git a/moonlight-common-c b/moonlight-common-c
index 4723f8b..509a17d 160000
--- a/moonlight-common-c
+++ b/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 4723f8ba7cce9b2dead1d2d441472836153fa8ed
+Subproject commit 509a17dbc3522e2981c9e312f0a7721566f6c2b5