From 813da03e9e757a93597c2b4d1b81da61cd2fac5b Mon Sep 17 00:00:00 2001 From: Luca Toniolo <10792599+grandixximo@users.noreply.github.com> Date: Thu, 20 Aug 2026 00:06:55 +1000 Subject: [PATCH] tree: remove includes that nothing in the file uses 104 #include lines across 82 files, of 30 distinct in-tree headers. None of them provides a name the including file mentions. Found by taking the names each in-tree header declares, macros, typedefs, tags, prototypes, extern variables and enum members, and checking whether any of them appears in the file that includes it. A heuristic that size is going to be wrong somewhere, so nothing here rests on it: every candidate was then put to the compiler. 209 came out of the heuristic, all 209 were removed at once and the tree built, the files that failed had their includes put back, and this is what survived a build with all of them gone together. Configured --with-realtime=uspace, no errors and no warnings. That build does not cover everything. Five of the files are outside what a uspace configuration compiles, so they were read by hand instead, and two of them kept their include: rtai_ulapi.c needs rtapi_rtai_shm_wrap.h, which declares nothing itself and only wraps rtai_shm.h, and fifousr.c takes FIFO_KEY and FIFO_SIZE from an anonymous enum in its own common.h. The ones that repeat are rtapi_math.h 21 times, rtapi_string.h 15, config.h 10, block.h 7, rtapi_slab.h and rtapi_mutex.h 6 each. An include costs nothing to leave in place, which is why these accumulated, but it is not free to a reader or to a dependency graph: each one asserts a relationship between two directories that turns out not to exist. --- src/emc/canterp/canterp.cc | 1 - src/emc/ini/inihal.cc | 1 - src/emc/motion-logger/motion-logger.c | 1 - src/emc/motion/control.c | 1 - src/emc/nml_intf/emc.cc | 2 -- src/emc/nml_intf/emcargs.cc | 1 - src/emc/rs274ngc/gcodemodule.cc | 2 -- src/emc/rs274ngc/interp_array.cc | 1 - src/emc/rs274ngc/interp_g7x.cc | 2 -- src/emc/rs274ngc/interp_python.cc | 1 - src/emc/rs274ngc/interp_queue.cc | 1 - src/emc/rs274ngc/interp_remap.cc | 1 - src/emc/rs274ngc/pyarrays.cc | 1 - src/emc/sai/driver.cc | 1 - src/emc/sai/dummyemcstat.cc | 1 - src/emc/sai/saicanon.cc | 1 - src/emc/task/emccanon.cc | 2 -- src/emc/task/taskclass.cc | 1 - src/emc/tooldata/tooldata_common.cc | 1 - src/emc/tp/blendmath.c | 1 - src/emc/tp/cruckig/calculator.c | 1 - src/emc/tp/cruckig/position_first_step1.c | 1 - src/emc/tp/cruckig/position_first_step2.c | 2 -- src/emc/tp/cruckig/position_second_step2.c | 2 -- src/emc/tp/cruckig/position_third_step2.c | 1 - src/emc/tp/cruckig/velocity_second_step1.c | 1 - src/emc/tp/cruckig/velocity_second_step2.c | 1 - src/emc/tp/cruckig/velocity_third_step2.c | 1 - src/emc/tp/tc.c | 1 - src/emc/tp/tp.c | 1 - src/emc/usr_intf/axis/extensions/togl.c | 1 - src/emc/usr_intf/emclcd.cc | 1 - src/emc/usr_intf/emcsched.cc | 2 -- src/emc/usr_intf/shcom.cc | 1 - src/emc/usr_intf/sockets.c | 1 - src/hal/components/div2.comp | 1 - src/hal/components/invert.comp | 1 - src/hal/components/millturn.comp | 1 - src/hal/components/ohmic.comp | 1 - src/hal/components/thc.comp | 1 - src/hal/components/thcud.comp | 1 - src/hal/components/time.comp | 1 - src/hal/components/userkins.comp | 1 - src/hal/drivers/mesa-hostmot2/abs_encoder.c | 3 --- src/hal/drivers/mesa-hostmot2/bitfile.c | 2 -- src/hal/drivers/mesa-hostmot2/bspi.c | 4 ---- src/hal/drivers/mesa-hostmot2/dpll.c | 3 --- src/hal/drivers/mesa-hostmot2/hm2_eth_net_evl.c | 1 - src/hal/drivers/mesa-hostmot2/hm2_eth_net_posix.c | 1 - src/hal/drivers/mesa-hostmot2/led.c | 1 - src/hal/drivers/mesa-hostmot2/oneshot.c | 1 - src/hal/drivers/mesa-hostmot2/outm.c | 1 - src/hal/drivers/mesa-hostmot2/periodm.c | 1 - src/hal/drivers/mesa-hostmot2/pins.c | 1 - src/hal/drivers/mesa-hostmot2/pktuart.c | 2 -- src/hal/drivers/mesa-hostmot2/raw.c | 2 -- src/hal/drivers/mesa-hostmot2/sserial.c | 1 - src/hal/drivers/mesa-hostmot2/tp_pwmgen.c | 1 - src/hal/drivers/mesa-hostmot2/uart.c | 3 --- src/hal/drivers/mesa-hostmot2/watchdog.c | 2 -- src/hal/drivers/serport.comp | 1 - src/hal/halmodule.cc | 2 -- src/hal/utils/halcmd.c | 1 - src/hal/utils/halcmd_completion.c | 1 - src/hal/utils/halcmd_main.c | 1 - src/hal/utils/halrmt.cc | 1 - src/hal/utils/meter.c | 1 - src/hal/utils/pci_read.c | 1 - src/hal/utils/pci_write.c | 1 - src/hal/utils/scope.c | 1 - src/hal/utils/scope_disp.c | 1 - src/hal/utils/scope_files.c | 1 - src/hal/utils/scope_horiz.c | 1 - src/hal/utils/scope_trig.c | 1 - src/hal/utils/scope_vert.c | 2 -- src/libnml/cms/cms.cc | 1 - src/libnml/cms/cms_dup.cc | 1 - src/libnml/nml/nml.cc | 1 - src/libnml/nml/stat_msg.cc | 1 - src/libnml/os_intf/_shm.c | 1 - src/rtapi/uspace_rtapi_main.cc | 1 - src/rtapi/uspace_ulapi.c | 1 - 82 files changed, 104 deletions(-) diff --git a/src/emc/canterp/canterp.cc b/src/emc/canterp/canterp.cc index 51e67f6832d..cb95320cf91 100644 --- a/src/emc/canterp/canterp.cc +++ b/src/emc/canterp/canterp.cc @@ -55,7 +55,6 @@ #include #include #include -#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 index 0d5325afac0..ba987919670 100644 --- 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 #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 index 70ff4ce2dd9..36b77e54528 100644 --- a/src/emc/motion-logger/motion-logger.c +++ b/src/emc/motion-logger/motion-logger.c @@ -33,7 +33,6 @@ #include #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 index cdc87901a55..2ddf587b484 100644 --- 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 index 0374a196a1f..3eb7360bdd3 100644 --- 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 index 26af761d09f..a0913302e0e 100644 --- a/src/emc/nml_intf/emcargs.cc +++ b/src/emc/nml_intf/emcargs.cc @@ -17,7 +17,6 @@ #include /* 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 diff --git a/src/emc/rs274ngc/gcodemodule.cc b/src/emc/rs274ngc/gcodemodule.cc index a6114cf1808..3b15edea612 100644 --- 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 index e33cb4b565f..74897b34650 100644 --- 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 index de6379b914a..32daff532cf 100644 --- 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 #include #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 index f8217637fc2..e3f8b60cc88 100644 --- 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 index cb5f58b0c17..921450caf45 100644 --- a/src/emc/rs274ngc/interp_queue.cc +++ b/src/emc/rs274ngc/interp_queue.cc @@ -14,7 +14,6 @@ #include #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 index c33df5a316c..9242a445805 100644 --- a/src/emc/rs274ngc/interp_remap.cc +++ b/src/emc/rs274ngc/interp_remap.cc @@ -27,7 +27,6 @@ namespace bp = boost::python; #include #include #include "rs274ngc.hh" -#include "rs274ngc_return.hh" #include "rs274ngc_interp.hh" #include "interp_internal.hh" #include diff --git a/src/emc/rs274ngc/pyarrays.cc b/src/emc/rs274ngc/pyarrays.cc index 5af54247185..50e30bd447d 100644 --- 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 index 1de6ebe7f95..b0275236c3a 100644 --- a/src/emc/sai/driver.cc +++ b/src/emc/sai/driver.cc @@ -35,7 +35,6 @@ #include #include #include -#include #include "saicanon.hh" #include "tooldata/tooldata.hh" diff --git a/src/emc/sai/dummyemcstat.cc b/src/emc/sai/dummyemcstat.cc index 13016c97ac9..aee1c813d30 100644 --- 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 -#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 index 8bbc3a6387c..169e73a8a39 100644 --- a/src/emc/sai/saicanon.cc +++ b/src/emc/sai/saicanon.cc @@ -41,7 +41,6 @@ #include #include #include -#include #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 index 30ce5d54eaf..a5f45837c99 100644 --- 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 #include #include @@ -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 #include "nml_intf/modal_state.hh" #include "tooldata/tooldata.hh" #include diff --git a/src/emc/task/taskclass.cc b/src/emc/task/taskclass.cc index c657448c79f..bd935e9a548 100644 --- 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 using namespace linuxcnc; diff --git a/src/emc/tooldata/tooldata_common.cc b/src/emc/tooldata/tooldata_common.cc index 040ff7ad807..c1b9c1ac35b 100644 --- a/src/emc/tooldata/tooldata_common.cc +++ b/src/emc/tooldata/tooldata_common.cc @@ -23,7 +23,6 @@ */ #include #include -#include #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 index 7217be015d5..c66d62e13b2 100644 --- 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 index 4f36f776836..b970c1c25d0 100644 --- 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 index 9edba78d2fa..96f11d5ab46 100644 --- 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 index ff9dd33c612..a9cf1cd2bd0 100644 --- 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 index eda16335732..ec383ebc8ae 100644 --- 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 index 7cbd8342985..8b37ab2ffde 100644 --- 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 index 38d8239fa8b..e476b91db01 100644 --- 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 index 349d3d272f5..9784fea0cf6 100644 --- 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 index 3b9f8b1261e..3ab5d4aa4b8 100644 --- 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 index 1acbd0e7072..651f6c6aa5d 100644 --- a/src/emc/tp/tc.c +++ b/src/emc/tp/tc.c @@ -18,7 +18,6 @@ #include #include #include -#include #include "blendmath.h" #include "tc.h" diff --git a/src/emc/tp/tp.c b/src/emc/tp/tp.c index 4d0d59d9091..b193b76fb83 100644 --- a/src/emc/tp/tp.c +++ b/src/emc/tp/tp.c @@ -17,7 +17,6 @@ #include #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 index 124755abdd7..a09872ae522 100644 --- 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 index 86bacaf3198..fda69f0bf6d 100644 --- a/src/emc/usr_intf/emclcd.cc +++ b/src/emc/usr_intf/emclcd.cc @@ -44,7 +44,6 @@ #include #include -#include #include // 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 index 1b62be7e59b..c67f2dcc8a4 100644 --- a/src/emc/usr_intf/emcsched.cc +++ b/src/emc/usr_intf/emcsched.cc @@ -26,13 +26,11 @@ #include #include "libnml/rcs/rcs.hh" -#include // 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 index e1236a44536..b1a585a34b5 100644 --- a/src/emc/usr_intf/shcom.cc +++ b/src/emc/usr_intf/shcom.cc @@ -19,7 +19,6 @@ #include #include -#include // PM_POSE, TO_RAD #include #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 index 92ea3914b18..755cf816fc4 100644 --- a/src/emc/usr_intf/sockets.c +++ b/src/emc/usr_intf/sockets.c @@ -13,7 +13,6 @@ * Last change: ********************************************************************/ -#include "config.h" #include #include #include diff --git a/src/hal/components/div2.comp b/src/hal/components/div2.comp index 5e3ec3e53b2..56f8bb0e7ed 100644 --- a/src/hal/components/div2.comp +++ b/src/hal/components/div2.comp @@ -40,7 +40,6 @@ function _; ;; -#include static bool error_msg = 0; diff --git a/src/hal/components/invert.comp b/src/hal/components/invert.comp index 91d55b7e1a7..cfd381dfb7a 100644 --- 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 FUNCTION(_) { rtapi_real tmp = in; diff --git a/src/hal/components/millturn.comp b/src/hal/components/millturn.comp index 1350d219c61..dbf18cd3a1c 100644 --- a/src/hal/components/millturn.comp +++ b/src/hal/components/millturn.comp @@ -35,7 +35,6 @@ license "GPL"; author "David Mueller"; ;; -#include #include static struct haldata { diff --git a/src/hal/components/ohmic.comp b/src/hal/components/ohmic.comp index 0979c49afdd..5e2be9714b9 100644 --- a/src/hal/components/ohmic.comp +++ b/src/hal/components/ohmic.comp @@ -65,7 +65,6 @@ option period no; function _; license "GPL"; ;; -#include 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 index 41adf2d69c5..1d3fd8e9399 100644 --- a/src/hal/components/thc.comp +++ b/src/hal/components/thc.comp @@ -92,7 +92,6 @@ function _; ;; -#include FUNCTION(_) { // convert encoder velocity to volts diff --git a/src/hal/components/thcud.comp b/src/hal/components/thcud.comp index cdfdd169408..1432f5fcde0 100644 --- a/src/hal/components/thcud.comp +++ b/src/hal/components/thcud.comp @@ -97,7 +97,6 @@ function _; ;; -#include FUNCTION(_) { if(enable){ diff --git a/src/hal/components/time.comp b/src/hal/components/time.comp index 532cf097591..2aa4061c5c3 100644 --- a/src/hal/components/time.comp +++ b/src/hal/components/time.comp @@ -116,7 +116,6 @@ function _; ;; -#include FUNCTION(_) { rtapi_u32 totalseconds; diff --git a/src/hal/components/userkins.comp b/src/hal/components/userkins.comp index 85e8800c02a..a2a25d88c29 100644 --- a/src/hal/components/userkins.comp +++ b/src/hal/components/userkins.comp @@ -66,7 +66,6 @@ license "GPL"; author "Dewey Garrett"; ;; -#include #include static struct haldata { diff --git a/src/hal/drivers/mesa-hostmot2/abs_encoder.c b/src/hal/drivers/mesa-hostmot2/abs_encoder.c index 8a8c96bf910..4309b34cb2c 100644 --- a/src/hal/drivers/mesa-hostmot2/abs_encoder.c +++ b/src/hal/drivers/mesa-hostmot2/abs_encoder.c @@ -4,12 +4,9 @@ #include -#include #include #include -#include -#include #include #include "hostmot2.h" diff --git a/src/hal/drivers/mesa-hostmot2/bitfile.c b/src/hal/drivers/mesa-hostmot2/bitfile.c index d97676f5d07..ae6ad1bacc0 100644 --- a/src/hal/drivers/mesa-hostmot2/bitfile.c +++ b/src/hal/drivers/mesa-hostmot2/bitfile.c @@ -26,8 +26,6 @@ #include #include -#include -#include #include diff --git a/src/hal/drivers/mesa-hostmot2/bspi.c b/src/hal/drivers/mesa-hostmot2/bspi.c index e1c504ce691..29a8facad74 100644 --- a/src/hal/drivers/mesa-hostmot2/bspi.c +++ b/src/hal/drivers/mesa-hostmot2/bspi.c @@ -16,11 +16,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // -#include -#include #include -#include -#include #include #include "hostmot2.h" diff --git a/src/hal/drivers/mesa-hostmot2/dpll.c b/src/hal/drivers/mesa-hostmot2/dpll.c index a8149bc8380..072cb5a368a 100644 --- a/src/hal/drivers/mesa-hostmot2/dpll.c +++ b/src/hal/drivers/mesa-hostmot2/dpll.c @@ -21,11 +21,8 @@ // other modules. -#include #include -#include -#include #include diff --git a/src/hal/drivers/mesa-hostmot2/hm2_eth_net_evl.c b/src/hal/drivers/mesa-hostmot2/hm2_eth_net_evl.c index 1ea562fa225..38958f7e659 100644 --- a/src/hal/drivers/mesa-hostmot2/hm2_eth_net_evl.c +++ b/src/hal/drivers/mesa-hostmot2/hm2_eth_net_evl.c @@ -35,7 +35,6 @@ #include #include -#include #include "hostmot2-lowlevel.h" #include "hm2_eth_net_evl.h" diff --git a/src/hal/drivers/mesa-hostmot2/hm2_eth_net_posix.c b/src/hal/drivers/mesa-hostmot2/hm2_eth_net_posix.c index 647dd3fe57f..43ae1358ec2 100644 --- a/src/hal/drivers/mesa-hostmot2/hm2_eth_net_posix.c +++ b/src/hal/drivers/mesa-hostmot2/hm2_eth_net_posix.c @@ -28,7 +28,6 @@ #include #include -#include #include "hostmot2-lowlevel.h" #include "hm2_eth_net_posix.h" diff --git a/src/hal/drivers/mesa-hostmot2/led.c b/src/hal/drivers/mesa-hostmot2/led.c index 48bbf661f83..5553142e4d3 100644 --- a/src/hal/drivers/mesa-hostmot2/led.c +++ b/src/hal/drivers/mesa-hostmot2/led.c @@ -24,7 +24,6 @@ #include #include -#include #include diff --git a/src/hal/drivers/mesa-hostmot2/oneshot.c b/src/hal/drivers/mesa-hostmot2/oneshot.c index f56fd522095..04d97d77d07 100644 --- a/src/hal/drivers/mesa-hostmot2/oneshot.c +++ b/src/hal/drivers/mesa-hostmot2/oneshot.c @@ -21,7 +21,6 @@ #include #include -#include #include diff --git a/src/hal/drivers/mesa-hostmot2/outm.c b/src/hal/drivers/mesa-hostmot2/outm.c index 41f4a4ba427..436f347e243 100644 --- a/src/hal/drivers/mesa-hostmot2/outm.c +++ b/src/hal/drivers/mesa-hostmot2/outm.c @@ -30,7 +30,6 @@ -#include #include #include diff --git a/src/hal/drivers/mesa-hostmot2/periodm.c b/src/hal/drivers/mesa-hostmot2/periodm.c index 9c589f7b325..08cb9b09095 100644 --- a/src/hal/drivers/mesa-hostmot2/periodm.c +++ b/src/hal/drivers/mesa-hostmot2/periodm.c @@ -21,7 +21,6 @@ #include #include -#include #include diff --git a/src/hal/drivers/mesa-hostmot2/pins.c b/src/hal/drivers/mesa-hostmot2/pins.c index 23fcb9a00d6..46a1e8a2ec9 100644 --- a/src/hal/drivers/mesa-hostmot2/pins.c +++ b/src/hal/drivers/mesa-hostmot2/pins.c @@ -21,7 +21,6 @@ #include #include -#include #include diff --git a/src/hal/drivers/mesa-hostmot2/pktuart.c b/src/hal/drivers/mesa-hostmot2/pktuart.c index 2c325cfd452..e5bd55610ad 100644 --- a/src/hal/drivers/mesa-hostmot2/pktuart.c +++ b/src/hal/drivers/mesa-hostmot2/pktuart.c @@ -16,10 +16,8 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // -#include #include #include -#include #include #include "hostmot2.h" #include "hostmot2-serial.h" diff --git a/src/hal/drivers/mesa-hostmot2/raw.c b/src/hal/drivers/mesa-hostmot2/raw.c index 7fb743b3b58..a296ee25105 100644 --- a/src/hal/drivers/mesa-hostmot2/raw.c +++ b/src/hal/drivers/mesa-hostmot2/raw.c @@ -17,11 +17,9 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // -#include #include #include -#include #include diff --git a/src/hal/drivers/mesa-hostmot2/sserial.c b/src/hal/drivers/mesa-hostmot2/sserial.c index 97d4fc2f033..bd43af2f292 100644 --- a/src/hal/drivers/mesa-hostmot2/sserial.c +++ b/src/hal/drivers/mesa-hostmot2/sserial.c @@ -27,7 +27,6 @@ #include #include "hostmot2.h" -#include "bitfile.h" // Local definition of labs() because RTAI compile barfs on using labs(). It // could be optimized using compiler built-ins, but the single use in here is diff --git a/src/hal/drivers/mesa-hostmot2/tp_pwmgen.c b/src/hal/drivers/mesa-hostmot2/tp_pwmgen.c index b5539e96a04..3fdc8fbd100 100644 --- a/src/hal/drivers/mesa-hostmot2/tp_pwmgen.c +++ b/src/hal/drivers/mesa-hostmot2/tp_pwmgen.c @@ -22,7 +22,6 @@ #include #include -#include #include diff --git a/src/hal/drivers/mesa-hostmot2/uart.c b/src/hal/drivers/mesa-hostmot2/uart.c index 609835b18f9..e8757ba58a6 100644 --- a/src/hal/drivers/mesa-hostmot2/uart.c +++ b/src/hal/drivers/mesa-hostmot2/uart.c @@ -16,10 +16,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // -#include #include -#include -#include #include #include "hostmot2.h" diff --git a/src/hal/drivers/mesa-hostmot2/watchdog.c b/src/hal/drivers/mesa-hostmot2/watchdog.c index 07422bdfdd3..242c3014753 100644 --- a/src/hal/drivers/mesa-hostmot2/watchdog.c +++ b/src/hal/drivers/mesa-hostmot2/watchdog.c @@ -20,8 +20,6 @@ #include #include -#include -#include #include diff --git a/src/hal/drivers/serport.comp b/src/hal/drivers/serport.comp index 3bbe66b22b2..bee4bab7f82 100644 --- a/src/hal/drivers/serport.comp +++ b/src/hal/drivers/serport.comp @@ -52,7 +52,6 @@ license "GPL"; ;; #include -#include #define MAX 8 int io[MAX] = {0,}; diff --git a/src/hal/halmodule.cc b/src/hal/halmodule.cc index 716b7354e41..3f581d7de4b 100644 --- a/src/hal/halmodule.cc +++ b/src/hal/halmodule.cc @@ -24,11 +24,9 @@ #include #include -#include #include #include "halqrec.hh" -#include "setps_util.h" #define EXCEPTION_IF_NOT_LIVE(retval) do { \ if(self->hal_id <= 0) { \ diff --git a/src/hal/utils/halcmd.c b/src/hal/utils/halcmd.c index 90bd7091b7a..542cb19b127 100644 --- a/src/hal/utils/halcmd.c +++ b/src/hal/utils/halcmd.c @@ -42,7 +42,6 @@ information, go to www.linuxcnc.org. */ -#include "config.h" #include #ifndef NO_INI diff --git a/src/hal/utils/halcmd_completion.c b/src/hal/utils/halcmd_completion.c index 7a6d7fbe3be..577a958f767 100644 --- a/src/hal/utils/halcmd_completion.c +++ b/src/hal/utils/halcmd_completion.c @@ -41,7 +41,6 @@ #include "config.h" #include /* RTAPI realtime OS API */ #include /* HAL public API decls */ -#include #include #include #include diff --git a/src/hal/utils/halcmd_main.c b/src/hal/utils/halcmd_main.c index d4e4a0fe369..0a52e10572c 100644 --- a/src/hal/utils/halcmd_main.c +++ b/src/hal/utils/halcmd_main.c @@ -39,7 +39,6 @@ #include "config.h" #include -#include #include #include #include "halcmd.h" diff --git a/src/hal/utils/halrmt.cc b/src/hal/utils/halrmt.cc index 583ebfafbc3..821d4db2329 100644 --- a/src/hal/utils/halrmt.cc +++ b/src/hal/utils/halrmt.cc @@ -52,7 +52,6 @@ #include #include -#include #include #include diff --git a/src/hal/utils/meter.c b/src/hal/utils/meter.c index dabe4236581..e371379955c 100644 --- a/src/hal/utils/meter.c +++ b/src/hal/utils/meter.c @@ -59,7 +59,6 @@ #include /* RTAPI realtime OS API */ #include /* HAL public API decls */ -#include #include #include "miscgtk.h" /* generic GTK stuff */ diff --git a/src/hal/utils/pci_read.c b/src/hal/utils/pci_read.c index f4db9cfee04..b9ea5b69f15 100644 --- a/src/hal/utils/pci_read.c +++ b/src/hal/utils/pci_read.c @@ -32,7 +32,6 @@ #include #include #include "upci.h" -#include "bitfile.h" /* define DEBUG_PRINTS to print info about command line parameters, the detected board, etc. */ diff --git a/src/hal/utils/pci_write.c b/src/hal/utils/pci_write.c index 3e9a63f3578..cf3d4b6480c 100644 --- a/src/hal/utils/pci_write.c +++ b/src/hal/utils/pci_write.c @@ -32,7 +32,6 @@ #include #include #include "upci.h" -#include "bitfile.h" /* define DEBUG_PRINTS to print info about command line parameters, the detected board, etc. */ diff --git a/src/hal/utils/scope.c b/src/hal/utils/scope.c index dd96030ee29..a402888c051 100644 --- a/src/hal/utils/scope.c +++ b/src/hal/utils/scope.c @@ -54,7 +54,6 @@ static char *license = \ #include #include "miscgtk.h" /* generic GTK stuff */ #include "scope_usr.h" /* scope related declarations */ -#include /*********************************************************************** * GLOBAL VARIABLES * diff --git a/src/hal/utils/scope_disp.c b/src/hal/utils/scope_disp.c index 75b79d36f0d..4953b697048 100644 --- a/src/hal/utils/scope_disp.c +++ b/src/hal/utils/scope_disp.c @@ -44,7 +44,6 @@ #include /* HAL public API decls */ #include -#include "miscgtk.h" /* generic GTK stuff */ #include "scope_usr.h" /* scope related declarations */ #define BUFLEN 80 /* length for sprintf buffers */ diff --git a/src/hal/utils/scope_files.c b/src/hal/utils/scope_files.c index c2942a050fd..199f37c7f27 100644 --- a/src/hal/utils/scope_files.c +++ b/src/hal/utils/scope_files.c @@ -45,7 +45,6 @@ #include /* HAL public API decls */ #include -#include "miscgtk.h" /* generic GTK stuff */ #include "scope_usr.h" /* scope related declarations */ /*********************************************************************** diff --git a/src/hal/utils/scope_horiz.c b/src/hal/utils/scope_horiz.c index 8f9a579b568..e5d0cc24840 100644 --- a/src/hal/utils/scope_horiz.c +++ b/src/hal/utils/scope_horiz.c @@ -45,7 +45,6 @@ #include #include /* RTAPI realtime OS API */ -#include #include /* HAL public API decls */ #include diff --git a/src/hal/utils/scope_trig.c b/src/hal/utils/scope_trig.c index 36bc38ec4d1..68d436ed783 100644 --- a/src/hal/utils/scope_trig.c +++ b/src/hal/utils/scope_trig.c @@ -31,7 +31,6 @@ information, go to https://linuxcnc.org. */ -#include "config.h" #include #include #define _(x) gettext(x) diff --git a/src/hal/utils/scope_vert.c b/src/hal/utils/scope_vert.c index 6d03a3563eb..daddb16b3c8 100644 --- a/src/hal/utils/scope_vert.c +++ b/src/hal/utils/scope_vert.c @@ -32,7 +32,6 @@ information, go to https://linuxcnc.org. */ -#include "config.h" #include #include #define _(x) gettext(x) @@ -45,7 +44,6 @@ #include #include // RTAPI realtime OS API -#include #include // rtapi_strlcpy() #include // HAL public API decls diff --git a/src/libnml/cms/cms.cc b/src/libnml/cms/cms.cc index dce9d5ac481..573a8ef3361 100644 --- a/src/libnml/cms/cms.cc +++ b/src/libnml/cms/cms.cc @@ -16,7 +16,6 @@ * Last change: ********************************************************************/ -#include "libnml/rcs/rcsversion.h" #include /* malloc(), free() */ #include /* size_t */ diff --git a/src/libnml/cms/cms_dup.cc b/src/libnml/cms/cms_dup.cc index 85cb81ee87b..f649fe8a302 100644 --- a/src/libnml/cms/cms_dup.cc +++ b/src/libnml/cms/cms_dup.cc @@ -26,7 +26,6 @@ #include "cms.hh" /* class CMS */ #include "cms_dup.hh" /* class CMS_DISPLAY_ASCII_UPDATER */ #include "libnml/rcs/rcs_print.hh" /* rcs_print_error() */ -#include #define DEFAULT_WARNING_COUNT_MAX 100 /* Member functions for CMS_DISPLAY_ASCII_UPDATER Class */ CMS_DISPLAY_ASCII_UPDATER::CMS_DISPLAY_ASCII_UPDATER(CMS * _cms_parent): diff --git a/src/libnml/nml/nml.cc b/src/libnml/nml/nml.cc index 8aefc634992..491e4dc4aa2 100644 --- a/src/libnml/nml/nml.cc +++ b/src/libnml/nml/nml.cc @@ -15,7 +15,6 @@ #define __STDC_FORMAT_MACROS #include -#include "libnml/rcs/rcsversion.h" #include // memcpy() #include // atexit() diff --git a/src/libnml/nml/stat_msg.cc b/src/libnml/nml/stat_msg.cc index 1743abc16b4..b09e12cf776 100644 --- a/src/libnml/nml/stat_msg.cc +++ b/src/libnml/nml/stat_msg.cc @@ -15,7 +15,6 @@ #include "nml.hh" #include "nmlmsg.hh" #include "libnml/cms/cms.hh" -#include "libnml/buffer/physmem.hh" #include "libnml/linklist/linklist.hh" #include "stat_msg.hh" diff --git a/src/libnml/os_intf/_shm.c b/src/libnml/os_intf/_shm.c index f9b4f975802..c0242ba49cd 100644 --- a/src/libnml/os_intf/_shm.c +++ b/src/libnml/os_intf/_shm.c @@ -13,7 +13,6 @@ * Last change: ********************************************************************/ -#include "config.h" #include "_shm.h" #include "libnml/rcs/rcs_print.hh" #include /* NULL */ diff --git a/src/rtapi/uspace_rtapi_main.cc b/src/rtapi/uspace_rtapi_main.cc index a36159634b1..99f0af8b17d 100644 --- a/src/rtapi/uspace_rtapi_main.cc +++ b/src/rtapi/uspace_rtapi_main.cc @@ -16,7 +16,6 @@ */ #include "config.h" -#include #ifdef __linux__ #include diff --git a/src/rtapi/uspace_ulapi.c b/src/rtapi/uspace_ulapi.c index bbcfefacb9f..41187bd0640 100644 --- a/src/rtapi/uspace_ulapi.c +++ b/src/rtapi/uspace_ulapi.c @@ -22,7 +22,6 @@ #include #include "rtapi.h" #include -#include #include "rtapi/uspace_common.h"