From bbfa5aeccf05d90c7a3788184faead2182156c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 9 Apr 2023 17:31:37 +0200
Subject: [PATCH] MeshTools: don't include STL crap in non-deprecated builds.

And only forward-declare std::tuple in the header if needed for a
deprecated signature.
---
 src/Magnum/MeshTools/CompressIndices.cpp | 6 +++++-
 src/Magnum/MeshTools/CompressIndices.h   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Magnum/MeshTools/CompressIndices.cpp b/src/Magnum/MeshTools/CompressIndices.cpp
index b687c978b..be3c9e9e1 100644
--- a/src/Magnum/MeshTools/CompressIndices.cpp
+++ b/src/Magnum/MeshTools/CompressIndices.cpp
@@ -27,13 +27,17 @@
 
 #include <cstring>
 #include <Corrade/Containers/Array.h>
-#include <Corrade/Containers/ArrayViewStl.h>
 #include <Corrade/Utility/Algorithms.h>
 
 #include "Magnum/Math/FunctionsBatch.h"
 #include "Magnum/MeshTools/Reference.h"
 #include "Magnum/Trade/MeshData.h"
 
+#ifdef MAGNUM_BUILD_DEPRECATED
+#include <tuple>
+#include <Corrade/Containers/ArrayViewStl.h>
+#endif
+
 namespace Magnum { namespace MeshTools {
 
 namespace {
diff --git a/src/Magnum/MeshTools/CompressIndices.h b/src/Magnum/MeshTools/CompressIndices.h
index 80cebfa38..eb12a955c 100644
--- a/src/Magnum/MeshTools/CompressIndices.h
+++ b/src/Magnum/MeshTools/CompressIndices.h
@@ -37,9 +37,9 @@
 #include "Magnum/Trade/Trade.h"
 
 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <tuple>
 #include <Corrade/Utility/Macros.h>
 #include <Corrade/Utility/StlForwardVector.h>
+#include <Corrade/Utility/StlForwardTuple.h>
 #endif
 
 namespace Magnum { namespace MeshTools {