From d983633db58f8cb599a95f74b83ac8adabda8060 Mon Sep 17 00:00:00 2001
From: Bo-Ru Ju <school.shsps@gmail.com>
Date: Thu, 11 Aug 2022 16:08:19 +0800
Subject: [PATCH] New package: libdpp-10.0.15

---
 srcpkgs/libdpp-devel                     |    1 +
 srcpkgs/libdpp/patches/fix-headers.patch | 1588 ++++++++++++++++++++++
 srcpkgs/libdpp/template                  |   30 +
 srcpkgs/libdpp/update                    |    2 +
 4 files changed, 1621 insertions(+)
 create mode 120000 srcpkgs/libdpp-devel
 create mode 100644 srcpkgs/libdpp/patches/fix-headers.patch
 create mode 100644 srcpkgs/libdpp/template
 create mode 100644 srcpkgs/libdpp/update

diff --git a/srcpkgs/libdpp-devel b/srcpkgs/libdpp-devel
new file mode 120000
index 000000000000..9176d7a850be
--- /dev/null
+++ b/srcpkgs/libdpp-devel
@@ -0,0 +1 @@
+libdpp
\ No newline at end of file
diff --git a/srcpkgs/libdpp/patches/fix-headers.patch b/srcpkgs/libdpp/patches/fix-headers.patch
new file mode 100644
index 000000000000..edbc0b1ba0e9
--- /dev/null
+++ b/srcpkgs/libdpp/patches/fix-headers.patch
@@ -0,0 +1,1588 @@
+diff --git a/include/dpp/appcommand.h b/include/dpp/appcommand.h
+index 50f2a29..99ae086 100644
+--- a/include/dpp/appcommand.h
++++ b/include/dpp/appcommand.h
+@@ -27,7 +27,7 @@
+ #include <dpp/role.h>
+ #include <dpp/user.h>
+ #include <variant>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/json_interface.h>
+ 
+ namespace dpp {
+diff --git a/include/dpp/application.h b/include/dpp/application.h
+index 7e9d80d..19fad83 100644
+--- a/include/dpp/application.h
++++ b/include/dpp/application.h
+@@ -26,7 +26,7 @@
+ #include <dpp/utility.h>
+ #include <dpp/user.h>
+ #include <dpp/permissions.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/json_interface.h>
+ 
+ namespace dpp {
+diff --git a/include/dpp/auditlog.h b/include/dpp/auditlog.h
+index 946ab41..2de5845 100644
+--- a/include/dpp/auditlog.h
++++ b/include/dpp/auditlog.h
+@@ -22,7 +22,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <optional>
+ #include <dpp/json_interface.h>
+ 
+diff --git a/include/dpp/automod.h b/include/dpp/automod.h
+index a15d52f..922df45 100644
+--- a/include/dpp/automod.h
++++ b/include/dpp/automod.h
+@@ -24,7 +24,7 @@
+ #include <dpp/snowflake.h>
+ #include <dpp/managed.h>
+ #include <dpp/utility.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/json_interface.h>
+ 
+ namespace dpp {
+diff --git a/include/dpp/ban.h b/include/dpp/ban.h
+index 6bbcdd2..8ad88d6 100644
+--- a/include/dpp/ban.h
++++ b/include/dpp/ban.h
+@@ -22,7 +22,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/json_interface.h>
+ #include <unordered_map>
+ 
+diff --git a/include/dpp/channel.h b/include/dpp/channel.h
+index 93b6e36..7e6b6e1 100644
+--- a/include/dpp/channel.h
++++ b/include/dpp/channel.h
+@@ -25,7 +25,7 @@
+ #include <dpp/managed.h>
+ #include <dpp/utility.h>
+ #include <dpp/voicestate.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/permissions.h>
+ #include <dpp/json_interface.h>
+ #include <unordered_map>
+diff --git a/include/dpp/cluster.h b/include/dpp/cluster.h
+index 59bbd85..f34d179 100644
+--- a/include/dpp/cluster.h
++++ b/include/dpp/cluster.h
+@@ -29,7 +29,7 @@
+ #include <dpp/dispatcher.h>
+ #include <dpp/misc-enum.h>
+ #include <dpp/timer.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/discordclient.h>
+ #include <dpp/voiceregion.h>
+ #include <dpp/dtemplate.h>
+diff --git a/include/dpp/commandhandler.h b/include/dpp/commandhandler.h
+index 29da473..0b15417 100644
+--- a/include/dpp/commandhandler.h
++++ b/include/dpp/commandhandler.h
+@@ -29,7 +29,7 @@
+ #include <dpp/appcommand.h>
+ #include <dpp/dispatcher.h>
+ #include <dpp/utility.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <unordered_map>
+ #include <vector>
+ #include <functional>
+diff --git a/include/dpp/discordclient.h b/include/dpp/discordclient.h
+index 1eb875a..10f010e 100644
+--- a/include/dpp/discordclient.h
++++ b/include/dpp/discordclient.h
+@@ -24,7 +24,7 @@
+ #include <string>
+ #include <map>
+ #include <vector>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/wsclient.h>
+ #include <dpp/dispatcher.h>
+ #include <dpp/cluster.h>
+diff --git a/include/dpp/discordevents.h b/include/dpp/discordevents.h
+index c6474a4..1a70b18 100644
+--- a/include/dpp/discordevents.h
++++ b/include/dpp/discordevents.h
+@@ -21,7 +21,7 @@
+ #pragma once
+ 
+ #include <dpp/export.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/include/dpp/discordvoiceclient.h b/include/dpp/discordvoiceclient.h
+index e11d653..6692e54 100644
+--- a/include/dpp/discordvoiceclient.h
++++ b/include/dpp/discordvoiceclient.h
+@@ -32,7 +32,7 @@
+ #include <string>
+ #include <map>
+ #include <vector>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/wsclient.h>
+ #include <dpp/dispatcher.h>
+ #include <dpp/cluster.h>
+diff --git a/include/dpp/dtemplate.h b/include/dpp/dtemplate.h
+index 948b25d..5fbe17e 100644
+--- a/include/dpp/dtemplate.h
++++ b/include/dpp/dtemplate.h
+@@ -21,7 +21,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <unordered_map>
+ #include <dpp/json_interface.h>
+ 
+diff --git a/include/dpp/emoji.h b/include/dpp/emoji.h
+index a73e58a..9ab9c1e 100644
+--- a/include/dpp/emoji.h
++++ b/include/dpp/emoji.h
+@@ -23,7 +23,7 @@
+ #include <dpp/snowflake.h>
+ #include <dpp/misc-enum.h>
+ #include <dpp/managed.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <unordered_map>
+ #include <dpp/json_interface.h>
+ 
+diff --git a/include/dpp/etf.h b/include/dpp/etf.h
+index 79b18d9..83415cc 100644
+--- a/include/dpp/etf.h
++++ b/include/dpp/etf.h
+@@ -34,7 +34,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/include/dpp/event.h b/include/dpp/event.h
+index b82f982..9f86e54 100644
+--- a/include/dpp/event.h
++++ b/include/dpp/event.h
+@@ -21,7 +21,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ #define event_decl(x,wstype) /** @brief Internal event handler for wstype websocket events. Called for each websocket message of this type. @internal */ \
+ 	class x : public event { public: virtual void handle(dpp::discord_client* client, nlohmann::json &j, const std::string &raw); };
+diff --git a/include/dpp/integration.h b/include/dpp/integration.h
+index 420c8d8..6815c3c 100644
+--- a/include/dpp/integration.h
++++ b/include/dpp/integration.h
+@@ -22,7 +22,7 @@
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+ #include <dpp/managed.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <unordered_map>
+ #include <dpp/json_interface.h>
+ 
+diff --git a/include/dpp/invite.h b/include/dpp/invite.h
+index eae62a9..e8977a8 100644
+--- a/include/dpp/invite.h
++++ b/include/dpp/invite.h
+@@ -21,7 +21,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/stage_instance.h>
+ #include <unordered_map>
+ #include <dpp/json_interface.h>
+diff --git a/include/dpp/json_interface.h b/include/dpp/json_interface.h
+index 302642d..e2e467a 100644
+--- a/include/dpp/json_interface.h
++++ b/include/dpp/json_interface.h
+@@ -22,7 +22,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <dpp/exception.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 	/**
+diff --git a/include/dpp/message.h b/include/dpp/message.h
+index a5e038f..7e705d0 100644
+--- a/include/dpp/message.h
++++ b/include/dpp/message.h
+@@ -27,7 +27,7 @@
+ #include <dpp/guild.h>
+ #include <optional>
+ #include <variant>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/json_interface.h>
+ 
+ namespace dpp {
+diff --git a/include/dpp/permissions.h b/include/dpp/permissions.h
+index caf248f..b370e56 100644
+--- a/include/dpp/permissions.h
++++ b/include/dpp/permissions.h
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #pragma once
+ #include <dpp/export.h>
+-#include <dpp/nlohmann/json.hpp>
++#include <nlohmann/json.hpp>
+ #include <cstdint>
+ #include <type_traits>
+ 
+diff --git a/include/dpp/presence.h b/include/dpp/presence.h
+index e018f92..bcf322b 100644
+--- a/include/dpp/presence.h
++++ b/include/dpp/presence.h
+@@ -22,7 +22,7 @@
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+ #include <dpp/emoji.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <unordered_map>
+ #include <dpp/json_interface.h>
+ 
+diff --git a/include/dpp/prune.h b/include/dpp/prune.h
+index dd1b19b..7528a37 100644
+--- a/include/dpp/prune.h
++++ b/include/dpp/prune.h
+@@ -21,7 +21,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/json_interface.h>
+ 
+ namespace dpp {
+diff --git a/include/dpp/restrequest.h b/include/dpp/restrequest.h
+index 2d1915c..20a4b3d 100644
+--- a/include/dpp/restrequest.h
++++ b/include/dpp/restrequest.h
+@@ -23,7 +23,7 @@
+ #include <dpp/snowflake.h>
+ #include <dpp/cluster.h>
+ #include <dpp/invite.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/include/dpp/role.h b/include/dpp/role.h
+index 4d6d13f..9327aae 100644
+--- a/include/dpp/role.h
++++ b/include/dpp/role.h
+@@ -21,7 +21,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <dpp/managed.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/permissions.h>
+ #include <dpp/guild.h>
+ #include <dpp/json_interface.h>
+diff --git a/include/dpp/scheduled_event.h b/include/dpp/scheduled_event.h
+index 2cddd63..39be997 100644
+--- a/include/dpp/scheduled_event.h
++++ b/include/dpp/scheduled_event.h
+@@ -24,7 +24,7 @@
+ #include <dpp/managed.h>
+ #include <dpp/user.h>
+ #include <dpp/guild.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/json_interface.h>
+ 
+ namespace dpp {
+diff --git a/include/dpp/stage_instance.h b/include/dpp/stage_instance.h
+index 90a134f..0ab205e 100644
+--- a/include/dpp/stage_instance.h
++++ b/include/dpp/stage_instance.h
+@@ -22,7 +22,7 @@
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+ #include <dpp/managed.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <unordered_map>
+ #include <dpp/json_interface.h>
+ 
+diff --git a/include/dpp/user.h b/include/dpp/user.h
+index 14245e3..a8a6b12 100644
+--- a/include/dpp/user.h
++++ b/include/dpp/user.h
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #pragma once
+ #include <dpp/export.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/snowflake.h>
+ #include <dpp/managed.h>
+ #include <dpp/utility.h>
+diff --git a/include/dpp/voiceregion.h b/include/dpp/voiceregion.h
+index a1def0a..a0a88e5 100644
+--- a/include/dpp/voiceregion.h
++++ b/include/dpp/voiceregion.h
+@@ -21,7 +21,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <unordered_map>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/json_interface.h>
+ 
+ namespace dpp {
+diff --git a/include/dpp/voicestate.h b/include/dpp/voicestate.h
+index 64f1517..c14461e 100644
+--- a/include/dpp/voicestate.h
++++ b/include/dpp/voicestate.h
+@@ -21,7 +21,7 @@
+ #pragma once
+ #include <dpp/export.h>
+ #include <dpp/snowflake.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <unordered_map>
+ #include <dpp/json_interface.h>
+ 
+diff --git a/include/dpp/webhook.h b/include/dpp/webhook.h
+index 98fa176..95c09dc 100644
+--- a/include/dpp/webhook.h
++++ b/include/dpp/webhook.h
+@@ -23,7 +23,7 @@
+ #include <dpp/snowflake.h>
+ #include <dpp/misc-enum.h>
+ #include <dpp/managed.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <unordered_map>
+ #include <dpp/json_interface.h>
+ 
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 139adf8..6c80610 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -196,8 +196,8 @@ foreach (fullmodname ${subdirlist})
+ 	target_precompile_headers(
+ 		${modname}
+ 		PRIVATE
+-		"${CMAKE_CURRENT_SOURCE_DIR}/../include/dpp/nlohmann/json_fwd.hpp"
+-		"${CMAKE_CURRENT_SOURCE_DIR}/../include/dpp/nlohmann/json.hpp"
++		<nlohmann/json_fwd.hpp>
++		<nlohmann/json.hpp>
+ 	)
+ 
+ 	if (WIN32 AND NOT MINGW)
+diff --git a/src/dpp/application.cpp b/src/dpp/application.cpp
+index a927d45..2799c2f 100644
+--- a/src/dpp/application.cpp
++++ b/src/dpp/application.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/snowflake.h>
+ #include <dpp/managed.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/auditlog.cpp b/src/dpp/auditlog.cpp
+index 2d547f3..3dad878 100644
+--- a/src/dpp/auditlog.cpp
++++ b/src/dpp/auditlog.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/auditlog.h>
+ #include <dpp/discordevents.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/automod.cpp b/src/dpp/automod.cpp
+index f35a924..3a711c4 100644
+--- a/src/dpp/automod.cpp
++++ b/src/dpp/automod.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/automod.h>
+ #include <dpp/discordevents.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/ban.cpp b/src/dpp/ban.cpp
+index 2f8744b..fa0a189 100644
+--- a/src/dpp/ban.cpp
++++ b/src/dpp/ban.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/ban.h>
+ #include <dpp/discordevents.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/channel.cpp b/src/dpp/channel.cpp
+index 364e574..77d4e75 100644
+--- a/src/dpp/channel.cpp
++++ b/src/dpp/channel.cpp
+@@ -25,7 +25,7 @@
+ #include <dpp/role.h>
+ #include <dpp/discordevents.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/cluster.cpp b/src/dpp/cluster.cpp
+index 011bdaf..969e088 100644
+--- a/src/dpp/cluster.cpp
++++ b/src/dpp/cluster.cpp
+@@ -29,7 +29,7 @@
+ #include <dpp/sync.h>
+ #include <chrono>
+ #include <iostream>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <utility>
+ #include <algorithm>
+ 
+diff --git a/src/dpp/cluster/confirmation.cpp b/src/dpp/cluster/confirmation.cpp
+index 36164a6..9ece5d8 100644
+--- a/src/dpp/cluster/confirmation.cpp
++++ b/src/dpp/cluster/confirmation.cpp
+@@ -19,7 +19,7 @@
+  *
+  ************************************************************************************/
+ #include <dpp/cluster.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/cluster/timer.cpp b/src/dpp/cluster/timer.cpp
+index af2e67e..1bad535 100644
+--- a/src/dpp/cluster/timer.cpp
++++ b/src/dpp/cluster/timer.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/timer.h>
+ #include <dpp/cluster.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/discordclient.cpp b/src/dpp/discordclient.cpp
+index adbf04e..8257167 100644
+--- a/src/dpp/discordclient.cpp
++++ b/src/dpp/discordclient.cpp
+@@ -26,7 +26,7 @@
+ #include <dpp/cache.h>
+ #include <dpp/cluster.h>
+ #include <thread>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/etf.h>
+ #include <zlib.h>
+ #ifdef _WIN32
+diff --git a/src/dpp/discordevents.cpp b/src/dpp/discordevents.cpp
+index 35f811b..c256590 100644
+--- a/src/dpp/discordevents.cpp
++++ b/src/dpp/discordevents.cpp
+@@ -30,7 +30,7 @@
+ #include <dpp/event.h>
+ #include <dpp/cache.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <time.h>
+ #include <iomanip>
+ #include <sstream>
+diff --git a/src/dpp/discordvoiceclient.cpp b/src/dpp/discordvoiceclient.cpp
+index 1981cd4..3aa62c4 100644
+--- a/src/dpp/discordvoiceclient.cpp
++++ b/src/dpp/discordvoiceclient.cpp
+@@ -41,7 +41,7 @@
+ #include <dpp/discordvoiceclient.h>
+ #include <dpp/cache.h>
+ #include <dpp/cluster.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ #ifdef HAVE_VOICE
+ 	#include <sodium.h>
+diff --git a/src/dpp/dtemplate.cpp b/src/dpp/dtemplate.cpp
+index 1e981ec..78c51b5 100644
+--- a/src/dpp/dtemplate.cpp
++++ b/src/dpp/dtemplate.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/dtemplate.h>
+ #include <dpp/discordevents.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/emoji.cpp b/src/dpp/emoji.cpp
+index 366f49a..bed2358 100644
+--- a/src/dpp/emoji.cpp
++++ b/src/dpp/emoji.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/emoji.h>
+ #include <dpp/discordevents.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/exception.h>
+ 
+ namespace dpp {
+diff --git a/src/dpp/etf.cpp b/src/dpp/etf.cpp
+index a97a063..1595c28 100644
+--- a/src/dpp/etf.cpp
++++ b/src/dpp/etf.cpp
+@@ -34,7 +34,7 @@
+ #include <dpp/sysdep.h>
+ #include <dpp/discordevents.h>
+ #include <dpp/exception.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <zlib.h>
+ #include <iostream>
+ 
+diff --git a/src/dpp/events/automod_rule_create.cpp b/src/dpp/events/automod_rule_create.cpp
+index ae9a662..879472a 100644
+--- a/src/dpp/events/automod_rule_create.cpp
++++ b/src/dpp/events/automod_rule_create.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/automod.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/automod_rule_delete.cpp b/src/dpp/events/automod_rule_delete.cpp
+index 08449cc..4005d5b 100644
+--- a/src/dpp/events/automod_rule_delete.cpp
++++ b/src/dpp/events/automod_rule_delete.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/automod.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/automod_rule_execute.cpp b/src/dpp/events/automod_rule_execute.cpp
+index b598260..9ad5bbd 100644
+--- a/src/dpp/events/automod_rule_execute.cpp
++++ b/src/dpp/events/automod_rule_execute.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/automod.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/automod_rule_update.cpp b/src/dpp/events/automod_rule_update.cpp
+index 24738bb..0310c7b 100644
+--- a/src/dpp/events/automod_rule_update.cpp
++++ b/src/dpp/events/automod_rule_update.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/automod.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/channel_create.cpp b/src/dpp/events/channel_create.cpp
+index 24307e1..ec533b8 100644
+--- a/src/dpp/events/channel_create.cpp
++++ b/src/dpp/events/channel_create.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/channel.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/channel_delete.cpp b/src/dpp/events/channel_delete.cpp
+index ef577bc..343d7bb 100644
+--- a/src/dpp/events/channel_delete.cpp
++++ b/src/dpp/events/channel_delete.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/channel.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/channel_pins_update.cpp b/src/dpp/events/channel_pins_update.cpp
+index 214cf4f..2b50601 100644
+--- a/src/dpp/events/channel_pins_update.cpp
++++ b/src/dpp/events/channel_pins_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/channel.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/channel_update.cpp b/src/dpp/events/channel_update.cpp
+index 24570dc..54ef33b 100644
+--- a/src/dpp/events/channel_update.cpp
++++ b/src/dpp/events/channel_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/channel.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_ban_add.cpp b/src/dpp/events/guild_ban_add.cpp
+index 057ce56..f7e9954 100644
+--- a/src/dpp/events/guild_ban_add.cpp
++++ b/src/dpp/events/guild_ban_add.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/ban.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_ban_remove.cpp b/src/dpp/events/guild_ban_remove.cpp
+index ad55cd7..1c61471 100644
+--- a/src/dpp/events/guild_ban_remove.cpp
++++ b/src/dpp/events/guild_ban_remove.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/ban.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_create.cpp b/src/dpp/events/guild_create.cpp
+index f6d8e5a..71accb3 100644
+--- a/src/dpp/events/guild_create.cpp
++++ b/src/dpp/events/guild_create.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/cache.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_delete.cpp b/src/dpp/events/guild_delete.cpp
+index 4186df4..f99d9db 100644
+--- a/src/dpp/events/guild_delete.cpp
++++ b/src/dpp/events/guild_delete.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/cache.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_emojis_update.cpp b/src/dpp/events/guild_emojis_update.cpp
+index d15d07b..15f228f 100644
+--- a/src/dpp/events/guild_emojis_update.cpp
++++ b/src/dpp/events/guild_emojis_update.cpp
+@@ -24,7 +24,7 @@
+ #include <dpp/emoji.h>
+ #include <dpp/cache.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_integrations_update.cpp b/src/dpp/events/guild_integrations_update.cpp
+index 080a7b8..afd63c8 100644
+--- a/src/dpp/events/guild_integrations_update.cpp
++++ b/src/dpp/events/guild_integrations_update.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/integration.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_join_request_delete.cpp b/src/dpp/events/guild_join_request_delete.cpp
+index b4bbbcc..cbece67 100644
+--- a/src/dpp/events/guild_join_request_delete.cpp
++++ b/src/dpp/events/guild_join_request_delete.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_member_add.cpp b/src/dpp/events/guild_member_add.cpp
+index ed08758..ff19b16 100644
+--- a/src/dpp/events/guild_member_add.cpp
++++ b/src/dpp/events/guild_member_add.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/guild.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_member_remove.cpp b/src/dpp/events/guild_member_remove.cpp
+index 3e2be13..cd7a35f 100644
+--- a/src/dpp/events/guild_member_remove.cpp
++++ b/src/dpp/events/guild_member_remove.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/guild.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_member_update.cpp b/src/dpp/events/guild_member_update.cpp
+index af81395..b6a7ea3 100644
+--- a/src/dpp/events/guild_member_update.cpp
++++ b/src/dpp/events/guild_member_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/guild.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_members_chunk.cpp b/src/dpp/events/guild_members_chunk.cpp
+index beffb96..d14a982 100644
+--- a/src/dpp/events/guild_members_chunk.cpp
++++ b/src/dpp/events/guild_members_chunk.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/cache.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_role_create.cpp b/src/dpp/events/guild_role_create.cpp
+index 98655a3..67d4faa 100644
+--- a/src/dpp/events/guild_role_create.cpp
++++ b/src/dpp/events/guild_role_create.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/role.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_role_delete.cpp b/src/dpp/events/guild_role_delete.cpp
+index 6784db6..6206333 100644
+--- a/src/dpp/events/guild_role_delete.cpp
++++ b/src/dpp/events/guild_role_delete.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/role.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_role_update.cpp b/src/dpp/events/guild_role_update.cpp
+index bab481c..1b53ec5 100644
+--- a/src/dpp/events/guild_role_update.cpp
++++ b/src/dpp/events/guild_role_update.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/role.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_scheduled_event_create.cpp b/src/dpp/events/guild_scheduled_event_create.cpp
+index f5a6c8a..59902a7 100644
+--- a/src/dpp/events/guild_scheduled_event_create.cpp
++++ b/src/dpp/events/guild_scheduled_event_create.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/scheduled_event.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_scheduled_event_delete.cpp b/src/dpp/events/guild_scheduled_event_delete.cpp
+index 692f271..e01cde9 100644
+--- a/src/dpp/events/guild_scheduled_event_delete.cpp
++++ b/src/dpp/events/guild_scheduled_event_delete.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/scheduled_event.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_scheduled_event_update.cpp b/src/dpp/events/guild_scheduled_event_update.cpp
+index b45d843..8b8465e 100644
+--- a/src/dpp/events/guild_scheduled_event_update.cpp
++++ b/src/dpp/events/guild_scheduled_event_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/scheduled_event.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_scheduled_event_user_add.cpp b/src/dpp/events/guild_scheduled_event_user_add.cpp
+index c3084e3..12a95be 100644
+--- a/src/dpp/events/guild_scheduled_event_user_add.cpp
++++ b/src/dpp/events/guild_scheduled_event_user_add.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_scheduled_event_user_remove.cpp b/src/dpp/events/guild_scheduled_event_user_remove.cpp
+index ca521b7..9777836 100644
+--- a/src/dpp/events/guild_scheduled_event_user_remove.cpp
++++ b/src/dpp/events/guild_scheduled_event_user_remove.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_stickers_update.cpp b/src/dpp/events/guild_stickers_update.cpp
+index 7e1fd9b..27ce7eb 100644
+--- a/src/dpp/events/guild_stickers_update.cpp
++++ b/src/dpp/events/guild_stickers_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/message.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_update.cpp b/src/dpp/events/guild_update.cpp
+index 6133a91..2aeafff 100644
+--- a/src/dpp/events/guild_update.cpp
++++ b/src/dpp/events/guild_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/guild.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/integration_create.cpp b/src/dpp/events/integration_create.cpp
+index 0f24458..8d8824f 100644
+--- a/src/dpp/events/integration_create.cpp
++++ b/src/dpp/events/integration_create.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/integration.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/integration_delete.cpp b/src/dpp/events/integration_delete.cpp
+index 9eb95fa..b10dfab 100644
+--- a/src/dpp/events/integration_delete.cpp
++++ b/src/dpp/events/integration_delete.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/integration.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/integration_update.cpp b/src/dpp/events/integration_update.cpp
+index 40741b9..3078e18 100644
+--- a/src/dpp/events/integration_update.cpp
++++ b/src/dpp/events/integration_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/integration.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/interaction_create.cpp b/src/dpp/events/interaction_create.cpp
+index 582e59b..cb4c5eb 100644
+--- a/src/dpp/events/interaction_create.cpp
++++ b/src/dpp/events/interaction_create.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/appcommand.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/invite_create.cpp b/src/dpp/events/invite_create.cpp
+index b5c500f..8dfcba6 100644
+--- a/src/dpp/events/invite_create.cpp
++++ b/src/dpp/events/invite_create.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/invite.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/invite_delete.cpp b/src/dpp/events/invite_delete.cpp
+index af6bc07..815e123 100644
+--- a/src/dpp/events/invite_delete.cpp
++++ b/src/dpp/events/invite_delete.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/invite.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/logger.cpp b/src/dpp/events/logger.cpp
+index 9614eb7..bc6e831 100644
+--- a/src/dpp/events/logger.cpp
++++ b/src/dpp/events/logger.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_create.cpp b/src/dpp/events/message_create.cpp
+index df5aebc..08e99d7 100644
+--- a/src/dpp/events/message_create.cpp
++++ b/src/dpp/events/message_create.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/message.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_delete.cpp b/src/dpp/events/message_delete.cpp
+index b4678e2..90deefd 100644
+--- a/src/dpp/events/message_delete.cpp
++++ b/src/dpp/events/message_delete.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/message.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_delete_bulk.cpp b/src/dpp/events/message_delete_bulk.cpp
+index 3636a5b..24c5f79 100644
+--- a/src/dpp/events/message_delete_bulk.cpp
++++ b/src/dpp/events/message_delete_bulk.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/message.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_reaction_add.cpp b/src/dpp/events/message_reaction_add.cpp
+index 2f95aa3..a85d837 100644
+--- a/src/dpp/events/message_reaction_add.cpp
++++ b/src/dpp/events/message_reaction_add.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/message.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_reaction_remove.cpp b/src/dpp/events/message_reaction_remove.cpp
+index b8838bb..d703048 100644
+--- a/src/dpp/events/message_reaction_remove.cpp
++++ b/src/dpp/events/message_reaction_remove.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/message.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_reaction_remove_all.cpp b/src/dpp/events/message_reaction_remove_all.cpp
+index 4952f90..c92dba0 100644
+--- a/src/dpp/events/message_reaction_remove_all.cpp
++++ b/src/dpp/events/message_reaction_remove_all.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/message.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_reaction_remove_emoji.cpp b/src/dpp/events/message_reaction_remove_emoji.cpp
+index c32391d..047d7b5 100644
+--- a/src/dpp/events/message_reaction_remove_emoji.cpp
++++ b/src/dpp/events/message_reaction_remove_emoji.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/message.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_update.cpp b/src/dpp/events/message_update.cpp
+index a23b5b9..49e45eb 100644
+--- a/src/dpp/events/message_update.cpp
++++ b/src/dpp/events/message_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/presence.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/presence_update.cpp b/src/dpp/events/presence_update.cpp
+index b324f09..d4ca44f 100644
+--- a/src/dpp/events/presence_update.cpp
++++ b/src/dpp/events/presence_update.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/ready.cpp b/src/dpp/events/ready.cpp
+index b301f18..e5802cb 100644
+--- a/src/dpp/events/ready.cpp
++++ b/src/dpp/events/ready.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/resumed.cpp b/src/dpp/events/resumed.cpp
+index 7d3f771..004c84c 100644
+--- a/src/dpp/events/resumed.cpp
++++ b/src/dpp/events/resumed.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/stage_instance_create.cpp b/src/dpp/events/stage_instance_create.cpp
+index 6540e02..a3d7803 100644
+--- a/src/dpp/events/stage_instance_create.cpp
++++ b/src/dpp/events/stage_instance_create.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/message.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/stage_instance_delete.cpp b/src/dpp/events/stage_instance_delete.cpp
+index dc133e5..27e160b 100644
+--- a/src/dpp/events/stage_instance_delete.cpp
++++ b/src/dpp/events/stage_instance_delete.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/stage_instance.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/stage_instance_update.cpp b/src/dpp/events/stage_instance_update.cpp
+index 1adbc1c..df4b765 100644
+--- a/src/dpp/events/stage_instance_update.cpp
++++ b/src/dpp/events/stage_instance_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/stage_instance.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_create.cpp b/src/dpp/events/thread_create.cpp
+index abc9efb..c70c8a9 100644
+--- a/src/dpp/events/thread_create.cpp
++++ b/src/dpp/events/thread_create.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/channel.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_delete.cpp b/src/dpp/events/thread_delete.cpp
+index b179f38..08e812c 100644
+--- a/src/dpp/events/thread_delete.cpp
++++ b/src/dpp/events/thread_delete.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/channel.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_list_sync.cpp b/src/dpp/events/thread_list_sync.cpp
+index 70b5f55..7ad047e 100644
+--- a/src/dpp/events/thread_list_sync.cpp
++++ b/src/dpp/events/thread_list_sync.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/channel.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_member_update.cpp b/src/dpp/events/thread_member_update.cpp
+index 2eb7a58..b4ee296 100644
+--- a/src/dpp/events/thread_member_update.cpp
++++ b/src/dpp/events/thread_member_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/channel.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_members_update.cpp b/src/dpp/events/thread_members_update.cpp
+index ebd34a5..e02e160 100644
+--- a/src/dpp/events/thread_members_update.cpp
++++ b/src/dpp/events/thread_members_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/channel.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_update.cpp b/src/dpp/events/thread_update.cpp
+index c459ed6..a74832b 100644
+--- a/src/dpp/events/thread_update.cpp
++++ b/src/dpp/events/thread_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/channel.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/typing_start.cpp b/src/dpp/events/typing_start.cpp
+index c7586bb..6e7dd57 100644
+--- a/src/dpp/events/typing_start.cpp
++++ b/src/dpp/events/typing_start.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/cluster.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/user_update.cpp b/src/dpp/events/user_update.cpp
+index 89f1002..5bc1c5e 100644
+--- a/src/dpp/events/user_update.cpp
++++ b/src/dpp/events/user_update.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/cache.h>
+ #include <dpp/user.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/voice_server_update.cpp b/src/dpp/events/voice_server_update.cpp
+index 2f9a9b3..a0ff19a 100644
+--- a/src/dpp/events/voice_server_update.cpp
++++ b/src/dpp/events/voice_server_update.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/voicestate.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/voice_state_update.cpp b/src/dpp/events/voice_state_update.cpp
+index 71f5780..af6cc73 100644
+--- a/src/dpp/events/voice_state_update.cpp
++++ b/src/dpp/events/voice_state_update.cpp
+@@ -24,7 +24,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/voicestate.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/webhooks_update.cpp b/src/dpp/events/webhooks_update.cpp
+index 81005c2..191675d 100644
+--- a/src/dpp/events/webhooks_update.cpp
++++ b/src/dpp/events/webhooks_update.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/cluster.h>
+ #include <dpp/webhook.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/guild.cpp b/src/dpp/guild.cpp
+index 4b1b2b9..0ead0cc 100644
+--- a/src/dpp/guild.cpp
++++ b/src/dpp/guild.cpp
+@@ -24,7 +24,7 @@
+ #include <dpp/guild.h>
+ #include <dpp/discordevents.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/integration.cpp b/src/dpp/integration.cpp
+index 066f727..f23e52c 100644
+--- a/src/dpp/integration.cpp
++++ b/src/dpp/integration.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/stringops.h>
+ #include <dpp/integration.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/cache.h>
+ 
+ using json = nlohmann::json;
+diff --git a/src/dpp/invite.cpp b/src/dpp/invite.cpp
+index d2c3825..c83f5fd 100644
+--- a/src/dpp/invite.cpp
++++ b/src/dpp/invite.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/invite.h>
+ #include <dpp/discordevents.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/message.cpp b/src/dpp/message.cpp
+index ddbac35..b0faa08 100644
+--- a/src/dpp/message.cpp
++++ b/src/dpp/message.cpp
+@@ -23,7 +23,7 @@
+ #include <dpp/channel.h>
+ #include <dpp/guild.h>
+ #include <dpp/cache.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/discordevents.h>
+ #include <dpp/stringops.h>
+ #include <dpp/exception.h>
+diff --git a/src/dpp/permissions.cpp b/src/dpp/permissions.cpp
+index 5985e6e..e7adab6 100644
+--- a/src/dpp/permissions.cpp
++++ b/src/dpp/permissions.cpp
+@@ -19,7 +19,7 @@
+  *
+  ************************************************************************************/
+ #include <dpp/permissions.h>
+-#include <dpp/nlohmann/json.hpp>
++#include <nlohmann/json.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/presence.cpp b/src/dpp/presence.cpp
+index e58fb74..dc14d8a 100644
+--- a/src/dpp/presence.cpp
++++ b/src/dpp/presence.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/utility.h>
+ #include <dpp/emoji.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/prune.cpp b/src/dpp/prune.cpp
+index 080a5c5..4f2cbc9 100644
+--- a/src/dpp/prune.cpp
++++ b/src/dpp/prune.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/prune.h>
+ #include <dpp/discordevents.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/role.cpp b/src/dpp/role.cpp
+index e952306..fdc6f8f 100644
+--- a/src/dpp/role.cpp
++++ b/src/dpp/role.cpp
+@@ -24,7 +24,7 @@
+ #include <dpp/discordevents.h>
+ #include <dpp/permissions.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/scheduled_event.cpp b/src/dpp/scheduled_event.cpp
+index dacf4ab..8f2a67a 100644
+--- a/src/dpp/scheduled_event.cpp
++++ b/src/dpp/scheduled_event.cpp
+@@ -22,7 +22,7 @@
+ #include <dpp/exception.h>
+ #include <dpp/discordevents.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/slashcommand.cpp b/src/dpp/slashcommand.cpp
+index c8fd774..d455fe1 100644
+--- a/src/dpp/slashcommand.cpp
++++ b/src/dpp/slashcommand.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/appcommand.h>
+ #include <dpp/discordevents.h>
+ #include <dpp/exception.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/stringops.h>
+ #include <dpp/cache.h>
+ #include <iostream>
+diff --git a/src/dpp/stage_instance.cpp b/src/dpp/stage_instance.cpp
+index 03e6ec4..154f075 100644
+--- a/src/dpp/stage_instance.cpp
++++ b/src/dpp/stage_instance.cpp
+@@ -21,7 +21,7 @@
+ #include <dpp/stage_instance.h>
+ #include <dpp/discordevents.h>
+ #include <dpp/stringops.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/user.cpp b/src/dpp/user.cpp
+index c20eeec..df8f61c 100644
+--- a/src/dpp/user.cpp
++++ b/src/dpp/user.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/user.h>
+ #include <dpp/discordevents.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/stringops.h>
+ 
+ using json = nlohmann::json;
+diff --git a/src/dpp/voiceregion.cpp b/src/dpp/voiceregion.cpp
+index 2dba305..7cf2341 100644
+--- a/src/dpp/voiceregion.cpp
++++ b/src/dpp/voiceregion.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/voiceregion.h>
+ #include <dpp/discordevents.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/voicestate.cpp b/src/dpp/voicestate.cpp
+index f7d6423..7df6fa8 100644
+--- a/src/dpp/voicestate.cpp
++++ b/src/dpp/voicestate.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/voicestate.h>
+ #include <dpp/discordevents.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/webhook.cpp b/src/dpp/webhook.cpp
+index 65ffd83..b4d26e4 100644
+--- a/src/dpp/webhook.cpp
++++ b/src/dpp/webhook.cpp
+@@ -20,7 +20,7 @@
+  ************************************************************************************/
+ #include <dpp/webhook.h>
+ #include <dpp/discordevents.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <dpp/exception.h>
+ 
+ namespace dpp {
+diff --git a/src/test.h b/src/test.h
+index f9ea580..bf2519e 100644
+--- a/src/test.h
++++ b/src/test.h
+@@ -24,7 +24,7 @@ _Pragma("warning( disable : 4251 )"); // 4251 warns when we export classes or st
+ _Pragma("warning( disable : 5105 )"); // 4251 warns when we export classes or structures with stl member variables
+ #endif
+ #include <dpp/dpp.h>
+-#include <dpp/nlohmann/json_fwd.hpp>
++#include <nlohmann/json_fwd.hpp>
+ #include <iomanip>
+ 
+ #ifdef _WIN32
diff --git a/srcpkgs/libdpp/template b/srcpkgs/libdpp/template
new file mode 100644
index 000000000000..97ac73d59c64
--- /dev/null
+++ b/srcpkgs/libdpp/template
@@ -0,0 +1,30 @@
+# Template file for 'libdpp'
+pkgname=libdpp
+version=10.0.15
+revision=1
+wrksrc=DPP-${version}
+build_style=cmake
+cmake_builddir=build
+hostmakedepends="pkg-config"
+makedepends="libsodium-devel opus-devel zlib-devel openssl-devel fmt-devel json-c++"
+short_desc="C++ Discord API Library for Bots"
+maintainer="Bo-Ru Ju <school.shsps@gmail.com>"
+license=Apache-2.0
+homepage="https://dpp.dev"
+distfiles="https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${version}.tar.gz"
+checksum=5370e7fa3e76ed78b87dc4d9c01cc5a5f1a5789ebf1d3d0e8deff05cb665c539
+
+post_extract() {
+	rm -r include/dpp/nlohmann
+}
+
+libdpp-devel_package() {
+	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		rm -r ${DESTDIR}/usr/lib/dpp-${version%.*}
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libdpp/update b/srcpkgs/libdpp/update
new file mode 100644
index 000000000000..f88d641f9275
--- /dev/null
+++ b/srcpkgs/libdpp/update
@@ -0,0 +1,2 @@
+site="https://github.com/brainboxdotcc/DPP/tags"
+pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'