From ceb119596256baf2338bf7f475ccd5350f4e906d Mon Sep 17 00:00:00 2001
From: Helmut Eller <eller.helmut@gmail.com>
Date: Tue, 9 Sep 2025 21:14:32 +0200
Subject: [PATCH] Reduce include path pollution

* configure.ac (MPS_CFLAGS): No longer add -I../mps/code for all files.
* src/igc.c: Instead, add ../mps/code only here.
---
 configure.ac |  2 +-
 src/igc.c    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 18b617c0e1f..0b561266e61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5570,7 +5570,7 @@ if test "${with_mps}" != "no"; then
   fi
   # Force -fno-omit-frame-pointer to avoid register scanning bug:
   # https://github.com/Ravenbrook/mps/pull/38
-  MPS_CFLAGS="-fno-omit-frame-pointer -I\$(top_srcdir)/mps/code"
+  MPS_CFLAGS="-fno-omit-frame-pointer"
 fi
 
 # FIXME: update for in-tree MPS
diff --git a/src/igc.c b/src/igc.c
index 4cd2b8c964b..e82c4a5303b 100644
--- a/src/igc.c
+++ b/src/igc.c
@@ -31,12 +31,12 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. */
 # pragma clang attribute push(__attribute__((warn_unused_result)), \
 			      apply_to = hasType(functionType))
 #endif
-#include <mps.h>
-#include <mpsavm.h>
-#include <mpscamc.h>
-#include "mpscams.h"
-#include <mpscawl.h>
-#include <mpslib.h>
+#include "../mps/code/mps.h"
+#include "../mps/code/mpsavm.h"
+#include "../mps/code/mpscamc.h"
+#include "../mps/code/mpscams.h"
+#include "../mps/code/mpscawl.h"
+#include "../mps/code/mpslib.h"
 #ifdef __clang__
 #pragma clang attribute pop
 #pragma clang diagnostic pop