Re: [PR PATCH] [Updated] New package: libdpp-10.0.10

[JuniorSuperTux <JuniorSuperTux@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]

There is an updated pull request by JuniorSuperTux against master on the void-packages repository

https://github.com/JuniorSuperTux/void-packages libdpp-10.0.10
https://github.com/void-linux/void-packages/pull/37554

New package: libdpp-10.0.10
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37554.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdpp-10.0.10-37554.patch --]
[-- Type: text/x-diff, Size: 58510 bytes --]

From d4b305ddd69f354c816304b1fe741bdbb4afe9c4 Mon Sep 17 00:00:00 2001
From: Bo-Ru Ju <school.shsps@gmail.com>
Date: Mon, 13 Jun 2022 18:29:35 +0800
Subject: [PATCH] New package: libdpp-10.0.10

---
 srcpkgs/libdpp-devel                          |    1 +
 .../libdpp/files/fix-headers-and-cmakefiles   | 1612 +++++++++++++++++
 srcpkgs/libdpp/files/fix-installed-cmakefiles |   86 +
 srcpkgs/libdpp/template                       |   40 +
 4 files changed, 1739 insertions(+)
 create mode 120000 srcpkgs/libdpp-devel
 create mode 100644 srcpkgs/libdpp/files/fix-headers-and-cmakefiles
 create mode 100644 srcpkgs/libdpp/files/fix-installed-cmakefiles
 create mode 100644 srcpkgs/libdpp/template

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/files/fix-headers-and-cmakefiles b/srcpkgs/libdpp/files/fix-headers-and-cmakefiles
new file mode 100644
index 000000000000..bc6575bf8593
--- /dev/null
+++ b/srcpkgs/libdpp/files/fix-headers-and-cmakefiles
@@ -0,0 +1,1612 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bbcc4b3..524a3ca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,7 +43,7 @@ math(EXPR DPP_VERSION_PATCH ${CMAKE_MATCH_3})
+ 
+ string(CONCAT DPP_VERSION ${DPP_VERSION_MAJOR}.${DPP_VERSION_MINOR}.${DPP_VERSION_PATCH})
+ 
+-project(libdpp VERSION ${DPP_VERSION} LANGUAGES CXX)
++project(dpp VERSION ${DPP_VERSION} LANGUAGES CXX)
+ 
+ check_cxx_symbol_exists(prctl "sys/prctl.h" HAVE_PRCTL)
+ check_cxx_symbol_exists(pthread_setname_np "pthread.h" HAVE_PTHREAD_SETNAME_NP)
+@@ -240,8 +240,8 @@ foreach (fullmodname ${subdirlist})
+ 	target_precompile_headers(
+ 		${modname}
+ 		PRIVATE
+-		"${PROJECT_SOURCE_DIR}/include/dpp/nlohmann/json.hpp"
+-		"${PROJECT_SOURCE_DIR}/include/dpp/nlohmann/json_fwd.hpp"
++		<nlohmann/json.hpp>
++		<nlohmann/json_fwd.hpp>
+ 	)
+ 
+ 	if (WIN32 AND NOT MINGW)
+@@ -325,14 +325,16 @@ if(NOT WIN32)
+ 	# Installation
+ 
+ 	include(GNUInstallDirs)
+-	install(TARGETS dpp LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++	install(TARGETS dpp EXPORT dpp-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(EXPORT dpp-targets DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 	install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 	install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -DRUN_LDCONFIG=${RUN_LDCONFIG} -DLDCONFIG_EXECUTABLE=${LDCONFIG_EXECUTABLE} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PostInstall.cmake)")
+ 
+ 	configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dpp.pc.in" "${CMAKE_BINARY_DIR}/dpp.pc" @ONLY)
+ 	install(FILES "${CMAKE_BINARY_DIR}/dpp.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ elseif(MINGW)
+-	install(TARGETS dpp LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++	install(TARGETS dpp EXPORT dpp-targets LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++install(EXPORT dpp-targets DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+ 	install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
+ endif()
+ 
+diff --git a/cmake/CPackSetup.cmake b/cmake/CPackSetup.cmake
+index a6bcf59..73abe7e 100644
+--- a/cmake/CPackSetup.cmake
++++ b/cmake/CPackSetup.cmake
+@@ -24,7 +24,7 @@ write_basic_package_version_file(${DPP_VERSION_FILE}
+ install(DIRECTORY include/ DESTINATION ${DPP_INSTALL_INCLUDE_DIR})
+ 
+ ## Include the file which allows `find_package(libdpp)` to function.
+-install(FILES cmake/libdpp-config.cmake ${DPP_VERSION_FILE} DESTINATION ${DPP_INSTALL_LIBRARY_DIR})
++install(FILES cmake/dpp-config.cmake ${DPP_VERSION_FILE} DESTINATION ${DPP_INSTALL_LIBRARY_DIR})
+ 
+ ## Export the targets to allow other projects to easily include this project
+ install(EXPORT ${DPP_EXPORT_NAME} DESTINATION ${DPP_INSTALL_LIBRARY_DIR} NAMESPACE dpp::)
+diff --git a/cmake/libdpp-config.cmake b/cmake/libdpp-config.cmake
+index d6dd5bd..d0009ac 100644
+--- a/cmake/libdpp-config.cmake
++++ b/cmake/libdpp-config.cmake
+@@ -1,10 +1,10 @@
+-# libdpp-config.cmake - package configuration file
++# dpp-config.cmake - package configuration file
+ 
+ ## Get current filesystem path (will a prefixed by where this package was installed)
+ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+ 
+-## Use this directory to include libdpp which has the rest of the project targets
+-include(${SELF_DIR}/libdpp.cmake)
++## Use this directory to include dpp which has the rest of the project targets
++include(${SELF_DIR}/dpp.cmake)
+ 
+ ## Set OpenSSl directory for macos. It is also in our main CMakeLists.txt, but this file is independent from that.
+ if(APPLE)
+@@ -16,6 +16,6 @@ if(APPLE)
+ 	find_package(OpenSSL REQUIRED)
+ endif()
+ 
+-# Search for libdpp dependencies
++# Search for dpp dependencies
+ include(CMakeFindDependencyMacro)
+ find_dependency(OpenSSL REQUIRED)
+diff --git a/include/dpp/appcommand.h b/include/dpp/appcommand.h
+index 424823c..36f8f82 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 3469630..ca878da 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/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 7335b28..b2fcc33 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 7ad5ade..40e1709 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 9cd9354..13b74e5 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 1c98e6a..1acd63b 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/include/dpp/event.h b/include/dpp/event.h
+index cd945f5..388a0d6 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/fmt-minimal.h b/include/dpp/fmt-minimal.h
+index a5e7a5d..88f1e38 100644
+--- a/include/dpp/fmt-minimal.h
++++ b/include/dpp/fmt-minimal.h
+@@ -1,3 +1,3 @@
+ #pragma once
+-#include <dpp/fmt/core.h>
++#include <fmt/core.h>
+ #define FMT_STRING(s) s
+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 1c80553..08de4c0 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/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 00d380a..389ca43 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 a723941..a77fccf 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/src/dpp/application.cpp b/src/dpp/application.cpp
+index b5eea41..5ffc9fc 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/fmt-minimal.h>
+ 
+ namespace dpp {
+diff --git a/src/dpp/auditlog.cpp b/src/dpp/auditlog.cpp
+index 72ef078..2a45729 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/ban.cpp b/src/dpp/ban.cpp
+index b959d75..860e5a4 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/channel.cpp b/src/dpp/channel.cpp
+index 405372c..6495b10 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/fmt-minimal.h>
+ 
+ using json = nlohmann::json;
+diff --git a/src/dpp/cluster.cpp b/src/dpp/cluster.cpp
+index aa1aad8..32b0b7a 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <utility>
+ #include <dpp/fmt-minimal.h>
+ #include <algorithm>
+diff --git a/src/dpp/cluster/confirmation.cpp b/src/dpp/cluster/confirmation.cpp
+index c7e579b..fcccb4c 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/cluster/timer.cpp b/src/dpp/cluster/timer.cpp
+index a4b6d83..7159574 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/discordclient.cpp b/src/dpp/discordclient.cpp
+index 9444fcb..8a498b8 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/fmt-minimal.h>
+ #include <dpp/etf.h>
+ #include <zlib.h>
+diff --git a/src/dpp/discordevents.cpp b/src/dpp/discordevents.cpp
+index 92bd66d..73b2b2f 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <time.h>
+ #include <iomanip>
+ #include <sstream>
+diff --git a/src/dpp/discordvoiceclient.cpp b/src/dpp/discordvoiceclient.cpp
+index ee3ac8e..8576e3c 100644
+--- a/src/dpp/discordvoiceclient.cpp
++++ b/src/dpp/discordvoiceclient.cpp
+@@ -43,7 +43,7 @@
+ #include <dpp/discordvoiceclient.h>
+ #include <dpp/cache.h>
+ #include <dpp/cluster.h>
+-#include <dpp/nlohmann/json.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/fmt-minimal.h>
+ 
+ #ifdef HAVE_VOICE
+diff --git a/src/dpp/dtemplate.cpp b/src/dpp/dtemplate.cpp
+index 31f6bbf..e3c67ea 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/emoji.cpp b/src/dpp/emoji.cpp
+index c0b3613..4f00958 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/exception.h>
+ 
+ namespace dpp {
+diff --git a/src/dpp/etf.cpp b/src/dpp/etf.cpp
+index 6395d9b..3b6159e 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <zlib.h>
+ #include <iostream>
+ 
+diff --git a/src/dpp/events/channel_create.cpp b/src/dpp/events/channel_create.cpp
+index 07b0c2c..1a0b812 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/channel_delete.cpp b/src/dpp/events/channel_delete.cpp
+index 09d23a4..5e48f96 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/channel_pins_update.cpp b/src/dpp/events/channel_pins_update.cpp
+index 3a4244b..cc2f908 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/channel_update.cpp b/src/dpp/events/channel_update.cpp
+index 7e05d8f..fde836a 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_ban_add.cpp b/src/dpp/events/guild_ban_add.cpp
+index 872b875..61dfb5b 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_ban_remove.cpp b/src/dpp/events/guild_ban_remove.cpp
+index e170fde..510a280 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_create.cpp b/src/dpp/events/guild_create.cpp
+index 6f1e369..9de1c39 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_delete.cpp b/src/dpp/events/guild_delete.cpp
+index 82f75d3..e39f4c8 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_emojis_update.cpp b/src/dpp/events/guild_emojis_update.cpp
+index 62588c0..ec4303d 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_integrations_update.cpp b/src/dpp/events/guild_integrations_update.cpp
+index 58146ae..0d2036f 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.hpp>
++#include <nlohmann/json.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 4b6da22..5642b4c 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_member_add.cpp b/src/dpp/events/guild_member_add.cpp
+index 6c865bb..2b3b8e8 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_member_remove.cpp b/src/dpp/events/guild_member_remove.cpp
+index fa23bed..46646b7 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_member_update.cpp b/src/dpp/events/guild_member_update.cpp
+index 6a9c3b7..689aac4 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_members_chunk.cpp b/src/dpp/events/guild_members_chunk.cpp
+index 03e1eb3..0e68089 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_role_create.cpp b/src/dpp/events/guild_role_create.cpp
+index b668bb5..ed8bc79 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_role_delete.cpp b/src/dpp/events/guild_role_delete.cpp
+index 6c8cedc..336f11b 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_role_update.cpp b/src/dpp/events/guild_role_update.cpp
+index 29130c0..32e3146 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.hpp>
++#include <nlohmann/json.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 02b3ba9..e84c134 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.hpp>
++#include <nlohmann/json.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 ea11ed9..a098a0f 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.hpp>
++#include <nlohmann/json.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 b43f02d..6fd2795 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.hpp>
++#include <nlohmann/json.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 38e07b6..c549c39 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.hpp>
++#include <nlohmann/json.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 4d6e8a0..08be1e9 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_stickers_update.cpp b/src/dpp/events/guild_stickers_update.cpp
+index 7f00c23..583d936 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/guild_update.cpp b/src/dpp/events/guild_update.cpp
+index d80b40b..e116688 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/integration_create.cpp b/src/dpp/events/integration_create.cpp
+index f72193c..112320b 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/integration_delete.cpp b/src/dpp/events/integration_delete.cpp
+index 0438076..e0b2202 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/integration_update.cpp b/src/dpp/events/integration_update.cpp
+index 8175fab..38b3eda 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/interaction_create.cpp b/src/dpp/events/interaction_create.cpp
+index a7bf466..a8aa25b 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/invite_create.cpp b/src/dpp/events/invite_create.cpp
+index 377ba3f..7d03d06 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/invite_delete.cpp b/src/dpp/events/invite_delete.cpp
+index 5f2f084..c9d81bb 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/logger.cpp b/src/dpp/events/logger.cpp
+index aefc82f..ee9d202 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_create.cpp b/src/dpp/events/message_create.cpp
+index be56ef8..80481e8 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_delete.cpp b/src/dpp/events/message_delete.cpp
+index d7ba0ea..98e7c2c 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_delete_bulk.cpp b/src/dpp/events/message_delete_bulk.cpp
+index a158bf1..cbffcf2 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_reaction_add.cpp b/src/dpp/events/message_reaction_add.cpp
+index fac7237..5e61959 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_reaction_remove.cpp b/src/dpp/events/message_reaction_remove.cpp
+index 1036757..1f602b1 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.hpp>
++#include <nlohmann/json.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 7a63660..a564afb 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.hpp>
++#include <nlohmann/json.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 c820bbe..93a3f9c 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/message_update.cpp b/src/dpp/events/message_update.cpp
+index 3259d88..90b6418 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/presence_update.cpp b/src/dpp/events/presence_update.cpp
+index af16087..7718019 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/ready.cpp b/src/dpp/events/ready.cpp
+index 1434794..b6dd917 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/fmt-minimal.h>
+ 
+ using json = nlohmann::json;
+diff --git a/src/dpp/events/resumed.cpp b/src/dpp/events/resumed.cpp
+index e28c8d8..98e174e 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/stage_instance_create.cpp b/src/dpp/events/stage_instance_create.cpp
+index bb191df..a53b3bc 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/stage_instance_delete.cpp b/src/dpp/events/stage_instance_delete.cpp
+index 639d259..d5bb97c 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/stage_instance_update.cpp b/src/dpp/events/stage_instance_update.cpp
+index 8422ffb..5349aab 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_create.cpp b/src/dpp/events/thread_create.cpp
+index 896999a..680bc92 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_delete.cpp b/src/dpp/events/thread_delete.cpp
+index 3969469..d195dac 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_list_sync.cpp b/src/dpp/events/thread_list_sync.cpp
+index ce518f5..19eee46 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_member_update.cpp b/src/dpp/events/thread_member_update.cpp
+index 00a5949..5868e8d 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_members_update.cpp b/src/dpp/events/thread_members_update.cpp
+index c744029..ea702a2 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/thread_update.cpp b/src/dpp/events/thread_update.cpp
+index 6be9cb6..b97e271 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/typing_start.cpp b/src/dpp/events/typing_start.cpp
+index fc8667b..189129a 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/user_update.cpp b/src/dpp/events/user_update.cpp
+index 3236c27..63fde16 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/voice_server_update.cpp b/src/dpp/events/voice_server_update.cpp
+index a70c831..fd5d984 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/voice_state_update.cpp b/src/dpp/events/voice_state_update.cpp
+index 4b316d4..79895e0 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/events/webhooks_update.cpp b/src/dpp/events/webhooks_update.cpp
+index e94e585..d4c49d0 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/format.cpp b/src/dpp/format.cpp
+index f95ab5d..2c6a1f2 100644
+--- a/src/dpp/format.cpp
++++ b/src/dpp/format.cpp
+@@ -5,7 +5,7 @@
+ //
+ // For the license information refer to format.h.
+ 
+-#include <dpp/fmt/format-inl.h>
++#include <fmt/format-inl.h>
+ 
+ FMT_BEGIN_NAMESPACE
+ namespace detail {
+diff --git a/src/dpp/guild.cpp b/src/dpp/guild.cpp
+index 1d47e7f..da26b04 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/fmt-minimal.h>
+ 
+ using json = nlohmann::json;
+diff --git a/src/dpp/integration.cpp b/src/dpp/integration.cpp
+index 0d7ffba..2057271 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/cache.h>
+ 
+ using json = nlohmann::json;
+diff --git a/src/dpp/invite.cpp b/src/dpp/invite.cpp
+index ec02903..9a39fee 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/message.cpp b/src/dpp/message.cpp
+index 284fd0d..252807c 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/discordevents.h>
+ #include <dpp/stringops.h>
+ #include <dpp/exception.h>
+diff --git a/src/dpp/os.cpp b/src/dpp/os.cpp
+index 9a126ca..f76e086 100644
+--- a/src/dpp/os.cpp
++++ b/src/dpp/os.cpp
+@@ -10,7 +10,7 @@
+ #  define _CRT_SECURE_NO_WARNINGS
+ #endif
+ 
+-#include <dpp/fmt/os.h>
++#include <fmt/os.h>
+ 
+ #include <climits>
+ 
+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 b432044..ab8b5f4 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/fmt-minimal.h>
+ 
+ using json = nlohmann::json;
+diff --git a/src/dpp/prune.cpp b/src/dpp/prune.cpp
+index 1d7cd49..50b0315 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/role.cpp b/src/dpp/role.cpp
+index 618e16d..3a8182b 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>
+ #include <dpp/fmt-minimal.h>
+ 
+ using json = nlohmann::json;
+diff --git a/src/dpp/scheduled_event.cpp b/src/dpp/scheduled_event.cpp
+index e049889..3113260 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/slashcommand.cpp b/src/dpp/slashcommand.cpp
+index 9ae3024..2872dac 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.hpp>
++#include <nlohmann/json.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 2b10760..34e514d 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/user.cpp b/src/dpp/user.cpp
+index e8e4dcd..5107c0f 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/fmt-minimal.h>
+ 
+ using json = nlohmann::json;
+diff --git a/src/dpp/utility.cpp b/src/dpp/utility.cpp
+index 57c9874..80a6b82 100644
+--- a/src/dpp/utility.cpp
++++ b/src/dpp/utility.cpp
+@@ -33,7 +33,7 @@
+ #include <fstream>
+ #include <streambuf>
+ #include <array>
+-#include <dpp/fmt/format.h>
++#include <fmt/format.h>
+ #include <dpp/cluster.h>
+ #include <dpp/dispatcher.h>
+ 
+diff --git a/src/dpp/voiceregion.cpp b/src/dpp/voiceregion.cpp
+index 0e13179..895f659 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ namespace dpp {
+ 
+diff --git a/src/dpp/voicestate.cpp b/src/dpp/voicestate.cpp
+index e1dd521..a68865f 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.hpp>
++#include <nlohmann/json.hpp>
+ 
+ using json = nlohmann::json;
+ 
+diff --git a/src/dpp/webhook.cpp b/src/dpp/webhook.cpp
+index a5e5e53..ad73796 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <dpp/exception.h>
+ 
+ namespace dpp {
+diff --git a/src/test.h b/src/test.h
+index 0b714f9..421ccad 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.hpp>
++#include <nlohmann/json.hpp>
+ #include <iomanip>
+ 
+ #ifdef _WIN32
diff --git a/srcpkgs/libdpp/files/fix-installed-cmakefiles b/srcpkgs/libdpp/files/fix-installed-cmakefiles
new file mode 100644
index 000000000000..359cd2fd0bd3
--- /dev/null
+++ b/srcpkgs/libdpp/files/fix-installed-cmakefiles
@@ -0,0 +1,86 @@
+diff -ruN /usr/lib/cmake/dpp/dpp-noconfig.cmake /usr/lib/cmake/dpp_patch/dpp-noconfig.cmake
+--- /usr/lib/cmake/dpp/dpp-noconfig.cmake	2022-06-23 23:29:54.000000000 +0800
++++ /usr/lib/cmake/dpp_patch/dpp-noconfig.cmake	2022-06-23 23:34:17.663735274 +0800
+@@ -8,12 +8,12 @@
+ # Import target "dpp::dpp" for configuration ""
+ set_property(TARGET dpp::dpp APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+ set_target_properties(dpp::dpp PROPERTIES
+-  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/lib64/dpp-10.0/libdpp.so.10.0.10"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/lib64/libdpp.so.10.0.10"
+   IMPORTED_SONAME_NOCONFIG "libdpp.so.10.0.10"
+   )
+ 
+ list(APPEND _IMPORT_CHECK_TARGETS dpp::dpp )
+-list(APPEND _IMPORT_CHECK_FILES_FOR_dpp::dpp "${_IMPORT_PREFIX}/lib64/dpp-10.0/libdpp.so.10.0.10" )
++list(APPEND _IMPORT_CHECK_FILES_FOR_dpp::dpp "${_IMPORT_PREFIX}/lib64/libdpp.so.10.0.10" )
+ 
+ # Commands beyond this point should not need to know the version.
+ set(CMAKE_IMPORT_FILE_VERSION)
+diff -ruN /usr/lib/cmake/dpp/dpp-targets-noconfig.cmake /usr/lib/cmake/dpp_patch/dpp-targets-noconfig.cmake
+--- /usr/lib/cmake/dpp/dpp-targets-noconfig.cmake	2022-06-23 23:29:54.000000000 +0800
++++ /usr/lib/cmake/dpp_patch/dpp-targets-noconfig.cmake	2022-06-23 23:34:17.670735274 +0800
+@@ -6,14 +6,14 @@
+ set(CMAKE_IMPORT_FILE_VERSION 1)
+ 
+ # Import target "dpp" for configuration ""
+-set_property(TARGET dpp APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+-set_target_properties(dpp PROPERTIES
++set_property(TARGET dpp::dpp APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(dpp::dpp PROPERTIES
+   IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/lib64/libdpp.so.10.0.10"
+   IMPORTED_SONAME_NOCONFIG "libdpp.so.10.0.10"
+   )
+ 
+-list(APPEND _IMPORT_CHECK_TARGETS dpp )
+-list(APPEND _IMPORT_CHECK_FILES_FOR_dpp "${_IMPORT_PREFIX}/lib64/libdpp.so.10.0.10" )
++list(APPEND _IMPORT_CHECK_TARGETS dpp::dpp )
++list(APPEND _IMPORT_CHECK_FILES_FOR_dpp::dpp "${_IMPORT_PREFIX}/lib64/libdpp.so.10.0.10" )
+ 
+ # Commands beyond this point should not need to know the version.
+ set(CMAKE_IMPORT_FILE_VERSION)
+diff -ruN /usr/lib/cmake/dpp/dpp-targets.cmake /usr/lib/cmake/dpp_patch/dpp-targets.cmake
+--- /usr/lib/cmake/dpp/dpp-targets.cmake	2022-06-23 23:29:54.000000000 +0800
++++ /usr/lib/cmake/dpp_patch/dpp-targets.cmake	2022-06-23 23:34:17.668735274 +0800
+@@ -47,7 +47,7 @@
+ # cross-prefix symbolic link such as /lib -> /usr/lib.
+ get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
+ get_filename_component(_realOrig "/usr/lib64" REALPATH)
+-if(_realCurr STREQUAL _realOrig)
++if(1)
+   set(_IMPORT_PREFIX "/usr/lib64")
+ endif()
+ unset(_realOrig)
+@@ -61,7 +61,7 @@
+ add_library(dpp SHARED IMPORTED)
+ 
+ set_target_properties(dpp PROPERTIES
+-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/dpp-10.0"
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+   INTERFACE_LINK_LIBRARIES "/usr/lib/libcrypto.so;/usr/lib/libssl.so;/usr/lib/libz.so;/usr/lib/libsodium.so;/usr/lib/libopus.so;/usr/lib/libm.so"
+ )
+ 
+diff -ruN /usr/lib/cmake/dpp/dpp.cmake /usr/lib/cmake/dpp_patch/dpp.cmake
+--- /usr/lib/cmake/dpp/dpp.cmake	2022-06-23 23:29:54.000000000 +0800
++++ /usr/lib/cmake/dpp_patch/dpp.cmake	2022-06-23 23:34:17.667735274 +0800
+@@ -46,9 +46,9 @@
+ # Use original install prefix when loaded through a
+ # cross-prefix symbolic link such as /lib -> /usr/lib.
+ get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
+-get_filename_component(_realOrig "/usr/lib64/dpp-10.0" REALPATH)
+-if(_realCurr STREQUAL _realOrig)
+-  set(_IMPORT_PREFIX "/usr/lib64/dpp-10.0")
++get_filename_component(_realOrig "/usr/lib64" REALPATH)
++if(1)
++  set(_IMPORT_PREFIX "/usr/lib64")
+ endif()
+ unset(_realOrig)
+ unset(_realCurr)
+@@ -62,7 +62,7 @@
+ add_library(dpp::dpp SHARED IMPORTED)
+ 
+ set_target_properties(dpp::dpp PROPERTIES
+-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/dpp-10.0"
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+   INTERFACE_LINK_LIBRARIES "/usr/lib/libcrypto.so;/usr/lib/libssl.so;/usr/lib/libz.so;/usr/lib/libsodium.so;/usr/lib/libopus.so;/usr/lib/libm.so"
+ )
+ 
diff --git a/srcpkgs/libdpp/template b/srcpkgs/libdpp/template
new file mode 100644
index 000000000000..37bde9d9e9d2
--- /dev/null
+++ b/srcpkgs/libdpp/template
@@ -0,0 +1,40 @@
+# Template file for 'libdpp'
+pkgname=libdpp
+version=10.0.10
+revision=1
+wrksrc=DPP-${version}
+build_style=cmake
+cmake_builddir=build
+hostmakedepends="pkg-config git"
+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=2a1c26f606298e5b683d1e140219c434e61c4b22e8510fa2a2d5f7b6758dff95
+
+post_extract() {
+	git apply ${FILESDIR}/fix-headers-and-cmakefiles
+	mv "${wrksrc}/cmake/libdpp-config.cmake" "${wrksrc}/cmake/dpp-config.cmake"
+	rm -r include/dpp/fmt
+	rm -r include/dpp/nlohmann
+}
+
+post_install() {
+	rm -r "${DESTDIR}/usr/lib/dpp-${version%.*}"
+}
+
+libdpp-devel_package() {
+	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmkdir usr/lib/cmake/dpp
+		find "${DESTDIR}/usr/lib" -iname "*.cmake" | while read file; do vinstall "$file" 644 "usr/lib/cmake/dpp"; done
+		vcopy ${FILESDIR}/fix-installed-cmakefiles usr/lib/cmake
+		patch -d/ -i ${PKGDESTDIR}/usr/lib/cmake/fix-installed-cmakefiles -p0
+		mv ${PKGDESTDIR}/usr/lib/cmake/dpp_patch ${PKGDESTDIR}/usr/lib/cmake/dpp
+	}
+}