LinuxCNC · BsAtHome · Aug 22, 2026 · Aug 19, 2026
diff --git a/src/emc/canterp/canterp.cc b/src/emc/canterp/canterp.cc
@@ -55,7 +55,6 @@
 #include <limits.h>
 #include <algorithm>
 #include <linuxcnc.h>
-#include "config.h"
 #include "nml_intf/interp_return.hh"
 #include "nml_intf/canon.hh"
 #include "rs274ngc/interp_base.hh"

diff --git a/src/emc/ini/inihal.cc b/src/emc/ini/inihal.cc
@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <rtapi_math.h>
 #include "inihal.hh"
 #include "iniaxis.hh"
-#include "inispindle.hh"
 
 static int debug=0;
 static int comp_id;

diff --git a/src/emc/motion-logger/motion-logger.c b/src/emc/motion-logger/motion-logger.c
@@ -33,7 +33,6 @@
 #include <hal.h>
 #include "motion/motion.h"
 #include "motion/motion_struct.h"
-#include "motion_types.h"
 #include "motion/mot_priv.h"
 #include "motion/axis.h"
 

diff --git a/src/emc/motion/control.c b/src/emc/motion/control.c
@@ -31,7 +31,6 @@
 #include "simple_tp.h"
 #include "motion.h"
 #include "mot_priv.h"
-#include "config.h"
 #include "homing.h"
 #include "axis.h"
 #include "../nml_intf/state_tag.h"

diff --git a/src/emc/nml_intf/emc.cc b/src/emc/nml_intf/emc.cc
@@ -22,10 +22,8 @@
 
 // Include command and status message definitions
 #include "canon.hh"
-#include "canon_position.hh"
 #include "emc.hh"
 #include "emc_nml.hh"
-#include "emcglb.h"
 #include "emcpos.h"
 #include "libnml/cms/cms.hh"
 

diff --git a/src/emc/nml_intf/emcargs.cc b/src/emc/nml_intf/emcargs.cc
@@ -17,7 +17,6 @@
 #include <stdio.h>		/* fgets() */
 #include "libnml/nml/nml.hh"               /* nmlSetHostAlias */
 #include "emcglb.h"		/* these decls */
-#include "emccfg.h"		/* their initial values */
 #include "libnml/rcs/rcs_print.hh"
 #include <rtapi_string.h>
 

diff --git a/src/emc/rs274ngc/gcodemodule.cc b/src/emc/rs274ngc/gcodemodule.cc
@@ -49,8 +49,6 @@
 #include "rs274ngc_interp.hh"
 #include "nml_intf/interp_return.hh"
 #include "nml_intf/canon.hh"
-#include "config.h"		// LINELEN
-#include "units.h"
 
 int _task = 0; // control preview behaviour when remapping
 

diff --git a/src/emc/rs274ngc/interp_array.cc b/src/emc/rs274ngc/interp_array.cc
@@ -11,7 +11,6 @@
 * Copyright (c) 2004 All rights reserved.
 ********************************************************************/
 
-#include "rs274ngc_return.hh"
 #include "rs274ngc_interp.hh"
 
 using namespace interp_param_global;

diff --git a/src/emc/rs274ngc/interp_g7x.cc b/src/emc/rs274ngc/interp_g7x.cc
@@ -915,10 +915,8 @@ void g7x::add_distance(double distance) {
 #include <cstring>
 #include <string>
 #include "rs274ngc.hh"
-#include "rs274ngc_return.hh"
 #include "rs274ngc_interp.hh"
 #include "interp_internal.hh"
-#include "units.h"
 
 class motion_machine:public motion_base {
     Interp *interp;

diff --git a/src/emc/rs274ngc/interp_python.cc b/src/emc/rs274ngc/interp_python.cc
@@ -38,7 +38,6 @@ namespace bp = boost::python;
 #include "nml_intf/interp_return.hh"
 #include "interp_internal.hh"
 #include "rs274ngc_interp.hh"
-#include "units.h"
 
 extern    PythonPlugin *python_plugin;
 

diff --git a/src/emc/rs274ngc/interp_queue.cc b/src/emc/rs274ngc/interp_queue.cc
@@ -14,7 +14,6 @@
 #include <math.h>
 
 #include "rs274ngc.hh"
-#include "rs274ngc_return.hh"
 #include "interp_queue.hh"
 #include "interp_internal.hh"
 #include "rs274ngc_interp.hh"

diff --git a/src/emc/rs274ngc/interp_remap.cc b/src/emc/rs274ngc/interp_remap.cc
@@ -27,7 +27,6 @@ namespace bp = boost::python;
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "rs274ngc.hh"
-#include "rs274ngc_return.hh"
 #include "rs274ngc_interp.hh"
 #include "interp_internal.hh"
 #include <rtapi_string.h>

diff --git a/src/emc/rs274ngc/pyarrays.cc b/src/emc/rs274ngc/pyarrays.cc
@@ -31,7 +31,6 @@ namespace bp = boost::python;
 #include "array1.hh"
 
 namespace pp = pyplusplus::containers::static_sized;
-#include "interp_array_types.hh"
 
 
 void export_Arrays()

diff --git a/src/emc/sai/driver.cc b/src/emc/sai/driver.cc
@@ -35,7 +35,6 @@
 #include <histedit.h>
 #include <glob.h>
 #include <wordexp.h>
-#include <rtapi_string.h>
 
 #include "saicanon.hh"
 #include "tooldata/tooldata.hh"

diff --git a/src/emc/sai/dummyemcstat.cc b/src/emc/sai/dummyemcstat.cc
@@ -18,7 +18,6 @@
 // keep linker happy so TaskMod can be resolved
 
 #include <stdio.h>
-#include "libnml/rcs/rcs.hh"		// NML classes, nmlErrorFormat()
 #include "nml_intf/emc.hh"		// EMC NML
 #include "nml_intf/emc_nml.hh"
 #include "rs274ngc/rs274ngc.hh"

diff --git a/src/emc/sai/saicanon.cc b/src/emc/sai/saicanon.cc
@@ -41,7 +41,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <rtapi_string.h>
 
 #define UNEXPECTED_MSG fprintf(stderr,"UNEXPECTED %s %d\n",__FILE__,__LINE__);
 

diff --git a/src/emc/task/emccanon.cc b/src/emc/task/emccanon.cc
@@ -48,7 +48,6 @@
   The code from University of Palermo is modified to work on planes xy, yz and zx by Joachim Franek
   */
 
-#include "config.h"
 #include <stdio.h>
 #include <stdarg.h>
 #include <math.h>
@@ -61,7 +60,6 @@
 #include "nml_intf/canon_position.hh"		// data type for a machine position
 #include "nml_intf/interpl.hh"		// interp_list
 #include "nml_intf/emcglb.h"		// TRAJ_MAX_VELOCITY
-#include <rtapi_string.h>
 #include "nml_intf/modal_state.hh"
 #include "tooldata/tooldata.hh"
 #include <algorithm>

diff --git a/src/emc/task/taskclass.cc b/src/emc/task/taskclass.cc
@@ -26,7 +26,6 @@
 
 #include "pythonplugin/python_plugin.hh"
 #include "taskclass.hh"
-#include <rtapi_string.h>
 
 using namespace linuxcnc;
 

diff --git a/src/emc/tooldata/tooldata_common.cc b/src/emc/tooldata/tooldata_common.cc
@@ -23,7 +23,6 @@
 */
 #include <stdio.h>
 #include <string.h>
-#include <rtapi_string.h>
 #include "tooldata.hh"
 
 #define UNEXPECTED_MSG fprintf(stderr,"UNEXPECTED %s %d\n",__FILE__,__LINE__);

diff --git a/src/emc/tp/blendmath.c b/src/emc/tp/blendmath.c
@@ -22,7 +22,6 @@
 #include "tp_debug.h"
 #include "../motion/motion.h"
 #include "../motion/mot_priv.h"
-#include "sp_scurve.h"
 
 /** @section utilityfuncs Utility functions */
 

diff --git a/src/emc/tp/cruckig/calculator.c b/src/emc/tp/cruckig/calculator.c
@@ -8,7 +8,6 @@
 #include "calculator.h"
 #include "position.h"
 #include "velocity.h"
-#include "utils.h"
 
 
 static const double eps = DBL_EPSILON;

diff --git a/src/emc/tp/cruckig/position_first_step1.c b/src/emc/tp/cruckig/position_first_step1.c
@@ -7,7 +7,6 @@
  */
 
 #include "position.h"
-#include "block.h"
 #include "profile.h"
 
 void cruckig_pos1_step1_init(CRuckigPositionFirstOrderStep1 *s,

diff --git a/src/emc/tp/cruckig/position_first_step2.c b/src/emc/tp/cruckig/position_first_step2.c
@@ -7,9 +7,7 @@
  */
 
 #include "position.h"
-#include "block.h"
 #include "profile.h"
-#include "roots.h"
 
 void cruckig_pos1_step2_init(CRuckigPositionFirstOrderStep2 *s,
                      double tf, double p0, double pf, double vMax, double vMin)

diff --git a/src/emc/tp/cruckig/position_second_step2.c b/src/emc/tp/cruckig/position_second_step2.c
@@ -7,9 +7,7 @@
  */
 
 #include "position.h"
-#include "block.h"
 #include "profile.h"
-#include "roots.h"
 
 void cruckig_pos2_step2_init(CRuckigPositionSecondOrderStep2 *s,
                      double tf, double p0, double v0, double pf, double vf,

diff --git a/src/emc/tp/cruckig/position_third_step2.c b/src/emc/tp/cruckig/position_third_step2.c
@@ -7,7 +7,6 @@
  */
 
 #include "position.h"
-#include "block.h"
 #include "profile.h"
 #include "roots.h"
 #include "utils.h"

diff --git a/src/emc/tp/cruckig/velocity_second_step1.c b/src/emc/tp/cruckig/velocity_second_step1.c
@@ -6,7 +6,6 @@
  * License: MIT, see the LICENSE file in this directory.
  */
 #include "velocity.h"
-#include "block.h"
 #include "profile.h"
 
 void cruckig_vel2_step1_init(CRuckigVelocitySecondOrderStep1 *s,

diff --git a/src/emc/tp/cruckig/velocity_second_step2.c b/src/emc/tp/cruckig/velocity_second_step2.c
@@ -6,7 +6,6 @@
  * License: MIT, see the LICENSE file in this directory.
  */
 #include "velocity.h"
-#include "block.h"
 #include "profile.h"
 
 void cruckig_vel2_step2_init(CRuckigVelocitySecondOrderStep2 *s,

diff --git a/src/emc/tp/cruckig/velocity_third_step2.c b/src/emc/tp/cruckig/velocity_third_step2.c
@@ -7,7 +7,6 @@
  */
 
 #include "velocity.h"
-#include "block.h"
 #include "profile.h"
 
 /* ---- Internal helper functions ---- */

diff --git a/src/emc/tp/tc.c b/src/emc/tp/tc.c
@@ -18,7 +18,6 @@
 #include <rtapi_math.h>
 #include <posemath.h>
 #include <emcpose.h>
-#include <motion_types.h>
 
 #include "blendmath.h"
 #include "tc.h"

diff --git a/src/emc/tp/tp.c b/src/emc/tp/tp.c
@@ -17,7 +17,6 @@
 #include <motion_types.h>
 #include "../motion/motion.h"
 #include "../motion/mot_priv.h"
-#include "../motion/axis.h"
 #include "tp.h"
 #include "tc.h"
 #include "spherical_arc.h"

diff --git a/src/emc/usr_intf/axis/extensions/togl.c b/src/emc/usr_intf/axis/extensions/togl.c
@@ -14,7 +14,6 @@
 #define X11
 #endif
 
-#include "config.h"
 
 /*** Windows headers ***/
 #if defined(WIN32) && !defined(X11) && !defined(macintosh)

diff --git a/src/emc/usr_intf/emclcd.cc b/src/emc/usr_intf/emclcd.cc
@@ -44,7 +44,6 @@
 #include <string.h>
 
 #include <rtapi_string.h>
-#include <linuxcnc.h>
 #include <posemath.h>		// PM_POSE, TO_RAD
 #include "libnml/rcs/rcs.hh"
 #include "nml_intf/emc.hh"		// EMC NML

diff --git a/src/emc/usr_intf/emcsched.cc b/src/emc/usr_intf/emcsched.cc
@@ -26,13 +26,11 @@
 #include <stdint.h>
 
 #include "libnml/rcs/rcs.hh"
-#include <posemath.h>		// PM_POSE, TO_RAD
 #include "nml_intf/emc.hh"		// EMC NML
 #include "nml_intf/emc_nml.hh"
 #include "nml_intf/canon.hh"		// CANON_UNITS, CANON_UNITS_INCHES,MM,CM
 #include "nml_intf/emcglb.h"		// EMC_NMLFILE, TRAJ_MAX_VELOCITY, etc.
 #include "nml_intf/emccfg.h"		// DEFAULT_TRAJ_MAX_VELOCITY
-#include "libnml/nml/nml_oi.hh"            // nmlErrorFormat, NML_ERROR, etc
 #include "libnml/rcs/rcs_print.hh"
 #include "libnml/os_intf/timer.hh"             // esleep
 #include "shcom.hh"             // Common NML communications functions

diff --git a/src/emc/usr_intf/shcom.cc b/src/emc/usr_intf/shcom.cc
@@ -19,7 +19,6 @@
 #include <fmt/format.h>
 
 #include <rtapi_string.h>
-#include <posemath.h>		// PM_POSE, TO_RAD
 #include <inifile.hh>
 #include "libnml/rcs/rcs.hh"
 #include "nml_intf/emc.hh"		// EMC NML

diff --git a/src/emc/usr_intf/sockets.c b/src/emc/usr_intf/sockets.c
@@ -13,7 +13,6 @@
 * Last change:
 ********************************************************************/
 
-#include "config.h"
 #include <unistd.h>
 #include <stddef.h>
 #include <stdio.h>

diff --git a/src/hal/components/div2.comp b/src/hal/components/div2.comp
@@ -40,7 +40,6 @@ function _;
 
 ;;
 
-#include <rtapi_math.h>
 
 static bool error_msg = 0;
 

diff --git a/src/hal/components/invert.comp b/src/hal/components/invert.comp
@@ -29,7 +29,6 @@ author "Stephen Wille Padnos";
 see_also " invert(9), div2(9) ";
 ;;
 
-#include <rtapi_math.h>
 
 FUNCTION(_) {
     rtapi_real tmp = in;

diff --git a/src/hal/components/millturn.comp b/src/hal/components/millturn.comp
@@ -35,7 +35,6 @@ license "GPL";
 author "David Mueller";
 ;;
 
-#include <rtapi_math.h>
 #include <kinematics.h>
 
 static struct haldata {

diff --git a/src/hal/components/ohmic.comp b/src/hal/components/ohmic.comp
@@ -65,7 +65,6 @@ option period no;
 function _;
 license "GPL";
 ;;
-#include <rtapi_math.h>
 
 FUNCTION(_) {
     rtapi_real thcad_vel_scale = 1/((thcad_max_volt_freq - thcad_0_volt_freq)/thcad_fullscale/thcad_divide);

diff --git a/src/hal/components/thc.comp b/src/hal/components/thc.comp
@@ -92,7 +92,6 @@ function _;
 
 ;;
 
-#include <rtapi_math.h>
 
 FUNCTION(_) {
     // convert encoder velocity to volts

diff --git a/src/hal/components/thcud.comp b/src/hal/components/thcud.comp
@@ -97,7 +97,6 @@ function _;
 
 ;;
 
-#include <rtapi_math.h>
 
 FUNCTION(_) {
     if(enable){

diff --git a/src/hal/components/time.comp b/src/hal/components/time.comp
@@ -116,7 +116,6 @@ function _;
 
 ;;
 
-#include <rtapi_math.h>
 
 FUNCTION(_) {
     rtapi_u32 totalseconds;

diff --git a/src/hal/components/userkins.comp b/src/hal/components/userkins.comp
@@ -66,7 +66,6 @@ license "GPL";
 author "Dewey Garrett";
 ;;
 
-#include <rtapi_math.h>
 #include <kinematics.h>
 
 static struct haldata {

diff --git a/src/hal/drivers/mesa-hostmot2/abs_encoder.c b/src/hal/drivers/mesa-hostmot2/abs_encoder.c
@@ -4,12 +4,9 @@
 
 
 #include <rtapi_slab.h>
-#include <rtapi_bool.h>
 
 #include <rtapi.h>
 #include <rtapi_string.h>
-#include <rtapi_math.h>
-#include <rtapi_math64.h>
 #include <hal.h>
 #include "hostmot2.h"
 

diff --git a/src/hal/drivers/mesa-hostmot2/bitfile.c b/src/hal/drivers/mesa-hostmot2/bitfile.c
@@ -26,8 +26,6 @@
 #include <rtapi_firmware.h>
 
 #include <rtapi.h>
-#include <rtapi_string.h>
-#include <rtapi_math.h>
 
 #include <hal.h>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,7 +40,6 @@ function _;

		;;

		#include <rtapi_math.h>

		static bool error_msg = 0;

Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,6 @@ function _; @@
     ;;
-    #include <rtapi_math.h>
     FUNCTION(_) {
         // convert encoder velocity to volts
@@ Expand Down @@