From fa7ff781fe24b382bad7eb5d7dabc99b737b1b3e Mon Sep 17 00:00:00 2001
From: Andrey Bychkov <andrey@signalmodelling.ru>
Date: Mon, 31 Aug 2026 19:12:38 +0300
Subject: [PATCH] refactor: use targeted includes (pibase_macros.h,
 piliterals_string.h) and guard <string> by PIP_HAS_RTTI

---
 libs/main/containers/pipair.h                          | 4 +++-
 libs/main/introspection/piintrospection_containers_p.h | 4 +++-
 libs/main/text/pistring_std.h                          | 2 +-
 libs/main/types/piflags.h                              | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libs/main/containers/pipair.h b/libs/main/containers/pipair.h
index 2eb92576..e549b03c 100644
--- a/libs/main/containers/pipair.h
+++ b/libs/main/containers/pipair.h
@@ -36,7 +36,9 @@
 
 #include "picout.h"
 
-#include <string>
+#if !PIP_HAS_RTTI
+#  include <string>
+#endif
 
 
 //! \addtogroup Containers
diff --git a/libs/main/introspection/piintrospection_containers_p.h b/libs/main/introspection/piintrospection_containers_p.h
index 5807c107..d126b751 100644
--- a/libs/main/introspection/piintrospection_containers_p.h
+++ b/libs/main/introspection/piintrospection_containers_p.h
@@ -25,7 +25,9 @@
 #include "pistring.h"
 
 #include <map>
-#include <string>
+#if !PIP_HAS_RTTI
+#  include <string>
+#endif
 
 
 class PIP_EXPORT PIIntrospectionContainers {
diff --git a/libs/main/text/pistring_std.h b/libs/main/text/pistring_std.h
index 7b904a18..634d7c53 100644
--- a/libs/main/text/pistring_std.h
+++ b/libs/main/text/pistring_std.h
@@ -37,7 +37,7 @@
 //! \~russian Совместимый псевдоним для широких строк на QNX.
 typedef std::basic_string<wchar_t> wstring;
 #endif
-#include "piliterals.h"
+#include "piliterals_string.h"
 #include "pistringlist.h"
 
 
diff --git a/libs/main/types/piflags.h b/libs/main/types/piflags.h
index d222944c..2c3c9113 100644
--- a/libs/main/types/piflags.h
+++ b/libs/main/types/piflags.h
@@ -27,7 +27,7 @@
 #define PIFLAGS_H
 
 
-#include "pibase.h"
+#include "pibase_macros.h"
 #if !PIP_HAS_RTTI
 #  include <string>
 #endif