diff --git a/CMakeLists.txt b/CMakeLists.txt
index de45f864..88750b7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -302,6 +302,8 @@ qt5_add_resources(LANG_QRC ${_qrc})
 qt5_add_resources(QRC resources/res.qrc)
 
 add_subdirectory(libs/matrix-structs)
+include_directories(${matrix_structs_SOURCE_DIR}/include)
+include_directories(${matrix_structs_SOURCE_DIR}/deps)
 
 set(COMMON_LIBS matrix_structs Qt5::Widgets Qt5::Network Qt5::Concurrent)
 
diff --git a/Makefile b/Makefile
index 20d79eda..772af477 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ docker-app-image: image
 		-v `pwd`:/build nheko-app-image make linux-appimage
 
 clean:
-	rm -rf build
+	git clean -xdf
+	git submodule foreach git clean -xdf
 
 .PHONY: build app dmg
diff --git a/libs/matrix-structs b/libs/matrix-structs
index d03a370f..d7227d21 160000
--- a/libs/matrix-structs
+++ b/libs/matrix-structs
@@ -1 +1 @@
-Subproject commit d03a370ffd1bbdd5623afbe9817d1b929bc76cd7
+Subproject commit d7227d213c253f784b3fd470e0ac98165d2de568