diff --git a/.gitmodules b/.gitmodules
index c088e63cc..45c84aee1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,3 +15,6 @@
 	path = lib/WinToast
 	url = https://github.com/mohabouje/WinToast.git
 	
+[submodule "lib/appbase"]
+	path = lib/appbase
+	url = https://github.com/fourtf/appbase
diff --git a/chatterino.pro b/chatterino.pro
index a53cb00e9..48ed84a60 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -17,10 +17,6 @@ TEMPLATE           = app
 PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
 CONFIG            += precompile_header
 
-# include appbase
-include(../appbase/appbase/main/main.pro)
-INCLUDEPATH += ../appbase/appbase/main
-
 useBreakpad {
     LIBS += -L$$PWD/lib/qBreakpad/handler/build
     include(lib/qBreakpad/qBreakpad.pri)
@@ -41,6 +37,7 @@ macx {
 }
 
 # Submodules
+include(lib/appbase.pri)
 include(lib/humanize.pri)
 include(lib/fmt.pri)
 DEFINES += IRC_NAMESPACE=Communi
@@ -56,12 +53,6 @@ include(lib/wintoast.pri)
 #    DEFINES += "USEWEBENGINE"
 #}
 
-werr {
-    QMAKE_CXXFLAGS += -Werror
-
-    message("Enabling error on warning")
-}
-
 SOURCES += \
     src/Application.cpp \
     src/common/Channel.cpp \
diff --git a/lib/appbase b/lib/appbase
new file mode 160000
index 000000000..1c565b772
--- /dev/null
+++ b/lib/appbase
@@ -0,0 +1 @@
+Subproject commit 1c565b77208b2b7d991014b1eb0d1c7ef6e4ce80
diff --git a/lib/appbase.pri b/lib/appbase.pri
new file mode 100644
index 000000000..8ac699223
--- /dev/null
+++ b/lib/appbase.pri
@@ -0,0 +1,3 @@
+# include appbase
+include($$PWD/appbase/appbase/main/main.pro)
+INCLUDEPATH += $$PWD/appbase/appbase/main