From 2751ae8561b8c5ce3cf34713e1d25c1df1b407a0 Mon Sep 17 00:00:00 2001
From: Luca Toniolo <10792599+grandixximo@users.noreply.github.com>
Date: Wed, 12 Aug 2026 21:30:56 +1000
Subject: [PATCH] src: include exported headers with angle brackets where they
 are used

The build copies every SRCHEADERS entry into include/, so an exported
header exists twice: the source under src/ and the copy modules compile
against.  A quoted include searches the includer's own directory before
the -I path, an angled include does not, so the two forms can reach
different copies of the same header and both compile.

An exported header travels to include/ and takes its siblings with it,
so it keeps the quoted form and finds them wherever it lands, and so
does its implementation, wanting the source rather than a stale export.
The files changed here are users, and build out of tree where only the
exported copies exist.
---
 src/emc/ini/iniaxis.cc             | 2 +-
 src/emc/ini/inijoint.cc            | 2 +-
 src/emc/ini/inispindle.cc          | 2 +-
 src/emc/ini/initraj.cc             | 2 +-
 src/emc/ini/inivalue.cc            | 2 +-
 src/hal/components/matrixkins.comp | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/emc/ini/iniaxis.cc b/src/emc/ini/iniaxis.cc
index e15744185a3..ea8440209c4 100644
--- a/src/emc/ini/iniaxis.cc
+++ b/src/emc/ini/iniaxis.cc
@@ -19,7 +19,7 @@
 #include "nml_intf/emcglb.h"
 #include "nml_intf/emccfg.h"
 #include "libnml/rcs/rcs_print.hh"
-#include "inifile.hh"
+#include <inifile.hh>
 
 #include "inihal.hh"
 #include "iniaxis.hh"
diff --git a/src/emc/ini/inijoint.cc b/src/emc/ini/inijoint.cc
index 37dff22f622..a4536b96c4c 100644
--- a/src/emc/ini/inijoint.cc
+++ b/src/emc/ini/inijoint.cc
@@ -17,7 +17,7 @@
 #include "libnml/rcs/rcs_print.hh"
 #include "nml_intf/emcglb.h"
 #include "nml_intf/emccfg.h"
-#include "inifile.hh"
+#include <inifile.hh>
 
 #include "inihal.hh"
 #include "inijoint.hh"
diff --git a/src/emc/ini/inispindle.cc b/src/emc/ini/inispindle.cc
index 7438ae02bcd..ecbfcab5b8b 100644
--- a/src/emc/ini/inispindle.cc
+++ b/src/emc/ini/inispindle.cc
@@ -20,7 +20,7 @@
 #include "libnml/rcs/rcs_print.hh"
 #include "nml_intf/emcglb.h"
 #include "nml_intf/emccfg.h"
-#include "inifile.hh"
+#include <inifile.hh>
 
 #include "inihal.hh"
 #include "inispindle.hh"
diff --git a/src/emc/ini/initraj.cc b/src/emc/ini/initraj.cc
index 0d440f34497..93656e8768b 100644
--- a/src/emc/ini/initraj.cc
+++ b/src/emc/ini/initraj.cc
@@ -18,7 +18,7 @@
 #include <emcpos.h>
 #include "libnml/rcs/rcs_print.hh"
 #include "nml_intf/emcglb.h"
-#include "inifile.hh"
+#include <inifile.hh>
 
 #include "inihal.hh"
 #include "initraj.hh"
diff --git a/src/emc/ini/inivalue.cc b/src/emc/ini/inivalue.cc
index f854db3f6bb..7bc5221f5be 100644
--- a/src/emc/ini/inivalue.cc
+++ b/src/emc/ini/inivalue.cc
@@ -22,7 +22,7 @@
 #include <getopt.h>
 #include <locale.h>
 
-#include "inifile.hh"
+#include <inifile.hh>
 
 using namespace linuxcnc;
 
diff --git a/src/hal/components/matrixkins.comp b/src/hal/components/matrixkins.comp
index c63a5e211c1..b12dedc2fcf 100644
--- a/src/hal/components/matrixkins.comp
+++ b/src/hal/components/matrixkins.comp
@@ -225,8 +225,8 @@ error:
     return -1;
 }
 
-#include "kinematics.h"
-#include "emcmotcfg.h"
+#include <kinematics.h>
+#include <emcmotcfg.h>
 
 KINS_NOT_SWITCHABLE
 EXPORT_SYMBOL(kinematicsType);