diff --git a/.gitmodules b/.gitmodules
index f34f62d0c..c4e2f3066 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,5 +5,5 @@
 	path = doc/doxygen/theme
 	url = https://github.com/jothepro/doxygen-awesome-css.git
 [submodule "libcockatrice_utility/libcockatrice/utility/cpp-peglib"]
-	path = libcockatrice_utility/libcockatrice/utility/cpp-peglib
+	path = thirdparty/cpp-peglib
 	url = https://github.com/yhirose/cpp-peglib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe808a652..fe9410731 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,6 +232,8 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0" AND NOT EXISTS "${Protobuf_PROTOC
   message(FATAL_ERROR "No protoc command found!")
 endif()
 
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cpp-peglib)
+
 #Find OpenSSL
 if(WIN32)
   find_package(OpenSSL REQUIRED)
diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp
index a90a31dc0..bef8e7f2e 100644
--- a/cockatrice/src/filters/deck_filter_string.cpp
+++ b/cockatrice/src/filters/deck_filter_string.cpp
@@ -3,7 +3,7 @@
 #include <QFileInfo>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/utility/cpp-peglib/peglib.h>
+#include <peglib.h>
 
 static peg::parser search(R"(
 Start <- QueryPartList
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
index 8eb83d65f..660b1831c 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
@@ -5,7 +5,7 @@
 #include <QRegularExpression>
 #include <QString>
 #include <functional>
-#include <libcockatrice/utility/cpp-peglib/peglib.h>
+#include <peglib.h>
 
 static peg::parser search(R"(
 Start <- QueryPartList
diff --git a/libcockatrice_utility/libcockatrice/utility/expression.cpp b/libcockatrice_utility/libcockatrice/utility/expression.cpp
index 905eec595..2cbcaf5fe 100644
--- a/libcockatrice_utility/libcockatrice/utility/expression.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/expression.cpp
@@ -1,11 +1,10 @@
 #include "expression.h"
 
-#include "cpp-peglib/peglib.h"
-
 #include <QByteArray>
 #include <QString>
 #include <QtMath>
 #include <functional>
+#include <peglib.h>
 
 peg::parser math(R"(
     EXPRESSION   <-  P0
diff --git a/libcockatrice_utility/libcockatrice/utility/cpp-peglib b/thirdparty/cpp-peglib
similarity index 100%
rename from libcockatrice_utility/libcockatrice/utility/cpp-peglib
rename to thirdparty/cpp-peglib