diff --git a/common-c.mk b/common-c.mk
index def814b..b2f904d 100644
--- a/common-c.mk
+++ b/common-c.mk
@@ -1,4 +1,4 @@
-COMMON_C_DIR := moonlight-common-c/limelight-common
+COMMON_C_DIR := moonlight-common-c/src
 OPENAES_DIR := $(COMMON_C_DIR)/OpenAES
 ENET_DIR := moonlight-common-c/enet
 
@@ -15,12 +15,6 @@ ENET_SOURCE := \
 
 ENET_INCLUDE := $(ENET_DIR)/include
 
-OPENAES_SOURCE := \
-	$(OPENAES_DIR)/oaes_base64.c \
-	$(OPENAES_DIR)/oaes_lib.c \
-	
-OPENAES_INCLUDE := $(OPENAES_DIR)
-
 COMMON_C_SOURCE := \
 	$(COMMON_C_DIR)/AudioStream.c         \
 	$(COMMON_C_DIR)/ByteBuffer.c          \
@@ -38,9 +32,8 @@ COMMON_C_SOURCE := \
 	$(COMMON_C_DIR)/SdpGenerator.c        \
 	$(COMMON_C_DIR)/VideoDepacketizer.c   \
 	$(COMMON_C_DIR)/VideoStream.c         \
-	$(OPENAES_SOURCE)                     \
     $(ENET_SOURCE)                        \
 
-COMMON_C_INCLUDE := $(COMMON_C_DIR) $(OPENAES_INCLUDE) $(ENET_INCLUDE)
+COMMON_C_INCLUDE := $(COMMON_C_DIR) $(ENET_INCLUDE)
 
 COMMON_C_C_FLAGS := -DLC_CHROME -Wno-missing-braces -DHAS_SOCKLEN_T=1 -DHAS_FCNTL=1 -DNO_MSGAPI=1
\ No newline at end of file
diff --git a/moonlight-common-c b/moonlight-common-c
index ec4fc23..61aaca3 160000
--- a/moonlight-common-c
+++ b/moonlight-common-c
@@ -1 +1 @@
-Subproject commit ec4fc23cd723b7510f1794edcb4f7fe157b6c77e
+Subproject commit 61aaca31d4fdc328fe605327d00ad00628ddcc03