From 22999e4704266c15c436e4ba88ba73c5a8eb2d0a Mon Sep 17 00:00:00 2001 From: Bertho Stultiens Date: Sun, 15 Nov 2026 16:31:49 +0100 Subject: [PATCH 1/2] build: Move exportable headers to include directory --- {src => include}/libnml/cms/cms.hh | 0 {src => include}/libnml/cms/cms_user.hh | 0 {src => include}/libnml/nml/cmd_msg.hh | 0 {src => include}/libnml/nml/nml.hh | 0 {src => include}/libnml/nml/nml_oi.hh | 0 {src => include}/libnml/nml/nml_type.hh | 0 {src => include}/libnml/nml/nmlmsg.hh | 0 {src => include}/libnml/nml/stat_msg.hh | 0 {src => include}/libnml/rcs/rcs.hh | 0 {src/emc => include}/nml_intf/canon.hh | 0 {src/emc => include}/nml_intf/canon_position.hh | 0 {src/emc => include}/nml_intf/debugflags.h | 0 {src/emc => include}/nml_intf/emc.hh | 0 {src/emc => include}/nml_intf/emc_nml.hh | 0 {src/emc => include}/nml_intf/emccfg.h | 0 {src/emc => include}/nml_intf/emcglb.h | 0 {src/emc => include}/nml_intf/emctool.h | 0 {src/emc => include}/nml_intf/interp_codes.h | 0 {src/emc => include}/nml_intf/modal_state.hh | 0 {src/emc => include}/nml_intf/state_tag.h | 0 {src/emc => include}/rcs_status.hh | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename {src => include}/libnml/cms/cms.hh (100%) rename {src => include}/libnml/cms/cms_user.hh (100%) rename {src => include}/libnml/nml/cmd_msg.hh (100%) rename {src => include}/libnml/nml/nml.hh (100%) rename {src => include}/libnml/nml/nml_oi.hh (100%) rename {src => include}/libnml/nml/nml_type.hh (100%) rename {src => include}/libnml/nml/nmlmsg.hh (100%) rename {src => include}/libnml/nml/stat_msg.hh (100%) rename {src => include}/libnml/rcs/rcs.hh (100%) rename {src/emc => include}/nml_intf/canon.hh (100%) rename {src/emc => include}/nml_intf/canon_position.hh (100%) rename {src/emc => include}/nml_intf/debugflags.h (100%) rename {src/emc => include}/nml_intf/emc.hh (100%) rename {src/emc => include}/nml_intf/emc_nml.hh (100%) rename {src/emc => include}/nml_intf/emccfg.h (100%) rename {src/emc => include}/nml_intf/emcglb.h (100%) rename {src/emc => include}/nml_intf/emctool.h (100%) rename {src/emc => include}/nml_intf/interp_codes.h (100%) rename {src/emc => include}/nml_intf/modal_state.hh (100%) rename {src/emc => include}/nml_intf/state_tag.h (100%) rename {src/emc => include}/rcs_status.hh (100%) diff --git a/src/libnml/cms/cms.hh b/include/libnml/cms/cms.hh similarity index 100% rename from src/libnml/cms/cms.hh rename to include/libnml/cms/cms.hh diff --git a/src/libnml/cms/cms_user.hh b/include/libnml/cms/cms_user.hh similarity index 100% rename from src/libnml/cms/cms_user.hh rename to include/libnml/cms/cms_user.hh diff --git a/src/libnml/nml/cmd_msg.hh b/include/libnml/nml/cmd_msg.hh similarity index 100% rename from src/libnml/nml/cmd_msg.hh rename to include/libnml/nml/cmd_msg.hh diff --git a/src/libnml/nml/nml.hh b/include/libnml/nml/nml.hh similarity index 100% rename from src/libnml/nml/nml.hh rename to include/libnml/nml/nml.hh diff --git a/src/libnml/nml/nml_oi.hh b/include/libnml/nml/nml_oi.hh similarity index 100% rename from src/libnml/nml/nml_oi.hh rename to include/libnml/nml/nml_oi.hh diff --git a/src/libnml/nml/nml_type.hh b/include/libnml/nml/nml_type.hh similarity index 100% rename from src/libnml/nml/nml_type.hh rename to include/libnml/nml/nml_type.hh diff --git a/src/libnml/nml/nmlmsg.hh b/include/libnml/nml/nmlmsg.hh similarity index 100% rename from src/libnml/nml/nmlmsg.hh rename to include/libnml/nml/nmlmsg.hh diff --git a/src/libnml/nml/stat_msg.hh b/include/libnml/nml/stat_msg.hh similarity index 100% rename from src/libnml/nml/stat_msg.hh rename to include/libnml/nml/stat_msg.hh diff --git a/src/libnml/rcs/rcs.hh b/include/libnml/rcs/rcs.hh similarity index 100% rename from src/libnml/rcs/rcs.hh rename to include/libnml/rcs/rcs.hh diff --git a/src/emc/nml_intf/canon.hh b/include/nml_intf/canon.hh similarity index 100% rename from src/emc/nml_intf/canon.hh rename to include/nml_intf/canon.hh diff --git a/src/emc/nml_intf/canon_position.hh b/include/nml_intf/canon_position.hh similarity index 100% rename from src/emc/nml_intf/canon_position.hh rename to include/nml_intf/canon_position.hh diff --git a/src/emc/nml_intf/debugflags.h b/include/nml_intf/debugflags.h similarity index 100% rename from src/emc/nml_intf/debugflags.h rename to include/nml_intf/debugflags.h diff --git a/src/emc/nml_intf/emc.hh b/include/nml_intf/emc.hh similarity index 100% rename from src/emc/nml_intf/emc.hh rename to include/nml_intf/emc.hh diff --git a/src/emc/nml_intf/emc_nml.hh b/include/nml_intf/emc_nml.hh similarity index 100% rename from src/emc/nml_intf/emc_nml.hh rename to include/nml_intf/emc_nml.hh diff --git a/src/emc/nml_intf/emccfg.h b/include/nml_intf/emccfg.h similarity index 100% rename from src/emc/nml_intf/emccfg.h rename to include/nml_intf/emccfg.h diff --git a/src/emc/nml_intf/emcglb.h b/include/nml_intf/emcglb.h similarity index 100% rename from src/emc/nml_intf/emcglb.h rename to include/nml_intf/emcglb.h diff --git a/src/emc/nml_intf/emctool.h b/include/nml_intf/emctool.h similarity index 100% rename from src/emc/nml_intf/emctool.h rename to include/nml_intf/emctool.h diff --git a/src/emc/nml_intf/interp_codes.h b/include/nml_intf/interp_codes.h similarity index 100% rename from src/emc/nml_intf/interp_codes.h rename to include/nml_intf/interp_codes.h diff --git a/src/emc/nml_intf/modal_state.hh b/include/nml_intf/modal_state.hh similarity index 100% rename from src/emc/nml_intf/modal_state.hh rename to include/nml_intf/modal_state.hh diff --git a/src/emc/nml_intf/state_tag.h b/include/nml_intf/state_tag.h similarity index 100% rename from src/emc/nml_intf/state_tag.h rename to include/nml_intf/state_tag.h diff --git a/src/emc/rcs_status.hh b/include/rcs_status.hh similarity index 100% rename from src/emc/rcs_status.hh rename to include/rcs_status.hh From 3e67b3daeb9fe35850e12163e7e3784be82c0e32 Mon Sep 17 00:00:00 2001 From: Bertho Stultiens Date: Sun, 15 Nov 2026 17:07:01 +0100 Subject: [PATCH 2/2] build: Update sources to address the new include location --- include/axis_kinds.hh | 4 ++-- include/libnml/cms/cms.hh | 4 ++-- include/libnml/cms/cms_user.hh | 4 ++-- include/libnml/nml/cmd_msg.hh | 4 ++-- include/libnml/nml/nml.hh | 6 +++--- include/libnml/nml/nml_oi.hh | 5 ++--- include/libnml/nml/nml_type.hh | 3 ++- include/libnml/nml/nmlmsg.hh | 4 ++-- include/libnml/nml/stat_msg.hh | 6 +++--- include/libnml/rcs/rcs.hh | 8 ++++---- include/nml_intf/canon.hh | 9 +++++---- include/nml_intf/canon_position.hh | 4 ++-- include/nml_intf/debugflags.h | 5 ++++- include/nml_intf/emc.hh | 9 +++++---- include/nml_intf/emc_nml.hh | 9 +++++---- include/nml_intf/emccfg.h | 4 ++-- include/nml_intf/emcglb.h | 4 ++-- include/nml_intf/emctool.h | 4 ++-- include/nml_intf/modal_state.hh | 5 +++-- include/nml_intf/state_tag.h | 4 ++-- include/rcs_status.hh | 4 ++-- src/emc/canterp/canterp.cc | 4 ++-- src/emc/ini/iniaxis.cc | 6 +++--- src/emc/ini/iniaxis.hh | 2 +- src/emc/ini/inifile.cc | 2 +- src/emc/ini/inihal.cc | 4 ++-- src/emc/ini/inijoint.cc | 6 +++--- src/emc/ini/inispindle.cc | 6 +++--- src/emc/ini/inispindle.hh | 2 +- src/emc/ini/initraj.cc | 4 ++-- src/emc/logutil.hh | 2 +- src/emc/motion/control.c | 2 +- src/emc/motion/motion.h | 2 +- src/emc/nml_intf/canon_position.cc | 2 +- src/emc/nml_intf/emc.cc | 8 ++++---- src/emc/nml_intf/emcargs.cc | 4 ++-- src/emc/nml_intf/emcglb.c | 4 ++-- src/emc/nml_intf/emcops.cc | 4 ++-- src/emc/nml_intf/interpl.hh | 4 ++-- src/emc/nml_intf/interpl_nml.hh | 4 ++-- src/emc/nml_intf/modal_state.cc | 2 +- src/emc/nml_intf/nurbs_math.hh | 2 +- src/emc/rs274ngc/gcode_renderer.cc | 2 +- src/emc/rs274ngc/gcodemodule.cc | 2 +- src/emc/rs274ngc/interp_base.hh | 4 ++-- src/emc/rs274ngc/interp_internal.hh | 2 +- src/emc/rs274ngc/nurbs_additional_functions.cc | 2 +- src/emc/rs274ngc/rs274ngc.hh | 6 +++--- src/emc/sai/driver.cc | 2 +- src/emc/sai/dummyemcstat.cc | 4 ++-- src/emc/sai/saicanon.hh | 2 +- src/emc/task/emccanon.cc | 14 +++++++------- src/emc/task/emcsvr.cc | 8 ++++---- src/emc/task/emctask.cc | 8 ++++---- src/emc/task/emctaskmain.cc | 12 ++++++------ src/emc/task/task.hh | 2 +- src/emc/task/taskclass.cc | 4 ++-- src/emc/task/taskclass.hh | 2 +- src/emc/task/taskintf.cc | 8 ++++---- src/emc/tooldata/tool_watch.cc | 4 ++-- src/emc/tooldata/tooldata.hh | 4 ++-- src/emc/tp/tc_types.h | 2 +- src/emc/usr_intf/axis/extensions/emcmodule.cc | 11 ++++++----- src/emc/usr_intf/emclcd.cc | 8 ++++---- src/emc/usr_intf/emcrsh.cc | 2 +- src/emc/usr_intf/emcsched.cc | 10 +++++----- src/emc/usr_intf/emcsched.hh | 4 ++-- src/emc/usr_intf/emcsh.cc | 10 +++++----- src/emc/usr_intf/halui.cc | 12 ++++++------ src/emc/usr_intf/schedrmt.cc | 8 ++++---- src/emc/usr_intf/shcom.cc | 15 ++++++++------- src/emc/usr_intf/shcom.hh | 4 ++-- src/libnml/buffer/locmem.cc | 2 -- src/libnml/buffer/locmem.hh | 2 +- src/libnml/buffer/phantom.cc | 1 - src/libnml/buffer/phantom.hh | 2 +- src/libnml/buffer/shmem.cc | 1 - src/libnml/buffer/shmem.hh | 2 +- src/libnml/buffer/tcpmem.hh | 2 +- src/libnml/cms/cms.cc | 2 +- src/libnml/cms/cms_aup.cc | 2 +- src/libnml/cms/cms_cfg.cc | 2 +- src/libnml/cms/cms_dup.cc | 2 +- src/libnml/cms/cms_in.cc | 2 +- src/libnml/cms/cms_srv.cc | 2 +- src/libnml/cms/cms_srv.hh | 2 +- src/libnml/cms/cms_up.cc | 2 +- src/libnml/cms/cms_up.hh | 2 +- src/libnml/cms/cms_xup.cc | 2 +- src/libnml/cms/cmsdiag.hh | 2 +- src/libnml/cms/tcp_srv.cc | 4 ++-- src/libnml/nml/cmd_msg.cc | 8 ++++---- src/libnml/nml/nml.cc | 8 ++++---- src/libnml/nml/nml_oi.cc | 3 ++- src/libnml/nml/nml_srv.cc | 8 ++++---- src/libnml/nml/nml_srv.hh | 2 +- src/libnml/nml/nmlmsg.cc | 4 ++-- src/libnml/nml/stat_msg.cc | 8 ++++---- 98 files changed, 224 insertions(+), 218 deletions(-) diff --git a/include/axis_kinds.hh b/include/axis_kinds.hh index 3b756029347..43e6ee98427 100644 --- a/include/axis_kinds.hh +++ b/include/axis_kinds.hh @@ -7,8 +7,8 @@ * * License: GPL Version 2 ********************************************************************/ -#ifndef AXIS_KINDS_HH -#define AXIS_KINDS_HH +#ifndef __LINUXCNC_AXIS_KINDS_HH +#define __LINUXCNC_AXIS_KINDS_HH #include #include diff --git a/include/libnml/cms/cms.hh b/include/libnml/cms/cms.hh index 5f857ee0d23..fec8a835daf 100644 --- a/include/libnml/cms/cms.hh +++ b/include/libnml/cms/cms.hh @@ -13,8 +13,8 @@ * Last change: ********************************************************************/ -#ifndef CMS_HH -#define CMS_HH +#ifndef __LINUXCNC_LIBNML_CMS_CMS_HH +#define __LINUXCNC_LIBNML_CMS_CMS_HH #include #include /* size_t */ diff --git a/include/libnml/cms/cms_user.hh b/include/libnml/cms/cms_user.hh index 716ff21a5da..14a5419ab9f 100644 --- a/include/libnml/cms/cms_user.hh +++ b/include/libnml/cms/cms_user.hh @@ -11,8 +11,8 @@ * * Last change: ********************************************************************/ -#ifndef CMS_USER_HH -#define CMS_USER_HH +#ifndef __LINUXCNC_LIBNML_CMS_CMS_USER_HH +#define __LINUXCNC_LIBNML_CMS_CMS_USER_HH class CMS; diff --git a/include/libnml/nml/cmd_msg.hh b/include/libnml/nml/cmd_msg.hh index 5413bfc3cfa..c969a41acae 100644 --- a/include/libnml/nml/cmd_msg.hh +++ b/include/libnml/nml/cmd_msg.hh @@ -11,8 +11,8 @@ * * Last change: ********************************************************************/ -#ifndef RCS_CMD_HH -#define RCS_CMD_HH +#ifndef __LINUXCNC_LIBNML_NML_CMD_MSG_HH +#define __LINUXCNC_LIBNML_NML_CMD_MSG_HH #include "nml.hh" #include "nmlmsg.hh" diff --git a/include/libnml/nml/nml.hh b/include/libnml/nml/nml.hh index 7461ac46a17..33edb6cf1d8 100644 --- a/include/libnml/nml/nml.hh +++ b/include/libnml/nml/nml.hh @@ -13,12 +13,12 @@ * Last change: ********************************************************************/ -#ifndef NML_HH -#define NML_HH +#ifndef __LINUXCNC_LIBNML_NML_NML_HH +#define __LINUXCNC_LIBNML_NML_NML_HH #include /* size_t */ -#include "libnml/cms/cms_user.hh" /* class CMS_USER */ +#include /* class CMS_USER */ class LinkedList; /* Generic NML Stuff */ #include "nml_type.hh" diff --git a/include/libnml/nml/nml_oi.hh b/include/libnml/nml/nml_oi.hh index ad56883b38d..97dbb90b1af 100644 --- a/include/libnml/nml/nml_oi.hh +++ b/include/libnml/nml/nml_oi.hh @@ -14,10 +14,9 @@ * Last change: ********************************************************************/ -#ifndef NML_OI_HH -#define NML_OI_HH +#ifndef __LINUXCNC_LIBNML_NML_NML_OI_HH +#define __LINUXCNC_LIBNML_NML_NML_OI_HH -#include "libnml/cms/cms.hh" // class CMS #include "nml.hh" // class NML #include "nmlmsg.hh" // class NMLmsg diff --git a/include/libnml/nml/nml_type.hh b/include/libnml/nml/nml_type.hh index 113f1f0deb0..9181a73e9fc 100644 --- a/include/libnml/nml/nml_type.hh +++ b/include/libnml/nml/nml_type.hh @@ -14,7 +14,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#ifndef NMLTYPE_TYPEDEFED +#ifndef __LINUXCNC_LIBNML_NML_NML_TYPE +#define __LINUXCNC_LIBNML_NML_NML_TYPE #define NMLTYPE_TYPEDEFED #include typedef int32_t NMLTYPE; diff --git a/include/libnml/nml/nmlmsg.hh b/include/libnml/nml/nmlmsg.hh index d96af647625..6b7a6b1c237 100644 --- a/include/libnml/nml/nmlmsg.hh +++ b/include/libnml/nml/nmlmsg.hh @@ -12,8 +12,8 @@ * Last change: ********************************************************************/ -#ifndef NMLMSG_HH -#define NMLMSG_HH +#ifndef __LINUXCNC_LIBNML_NML_NMLMSG_HH +#define __LINUXCNC_LIBNML_NML_NMLMSG_HH #include /* size_t */ diff --git a/include/libnml/nml/stat_msg.hh b/include/libnml/nml/stat_msg.hh index 77b81e144c0..6da5b93ab0c 100644 --- a/include/libnml/nml/stat_msg.hh +++ b/include/libnml/nml/stat_msg.hh @@ -11,12 +11,12 @@ * * Last change: ********************************************************************/ -#ifndef RCS_STAT_HH -#define RCS_STAT_HH +#ifndef __LINUXCNC_LIBNML_NML_STAT_MSG_HH +#define __LINUXCNC_LIBNML_NML_STAT_MSG_HH #include "nml.hh" #include "nmlmsg.hh" -#include "libnml/rcs/rcs.hh" +#include class RCS_STAT_MSG:public NMLmsg { public: diff --git a/include/libnml/rcs/rcs.hh b/include/libnml/rcs/rcs.hh index a3d48b70705..abb3ea3ef1b 100644 --- a/include/libnml/rcs/rcs.hh +++ b/include/libnml/rcs/rcs.hh @@ -13,8 +13,8 @@ * * Last change: ********************************************************************/ -#ifndef RCS_HH -#define RCS_HH +#ifndef __LINUXCNC_LIBNML_RCS_RCS_HH +#define __LINUXCNC_LIBNML_RCS_RCS_HH class RCS_LINKED_LIST; class NMLmsg; @@ -29,7 +29,7 @@ class RCS_STAT_MSG; // The underlying type specifier of int is meant to stress that it // is of paramount importance that the underlying type of the // RCS_STATUS enum is int. See nml/stat_msg.hh for more details. -#include "rcs_status.hh" // enum class RCS_STATUS +#include // enum class RCS_STATUS -#include "libnml/nml/nml_type.hh" +#include #endif /* !defined(RCS_HH) */ diff --git a/include/nml_intf/canon.hh b/include/nml_intf/canon.hh index f32e3317348..8ac370bc8cc 100644 --- a/include/nml_intf/canon.hh +++ b/include/nml_intf/canon.hh @@ -10,8 +10,8 @@ * Copyright (c) 2004 All rights reserved. * ********************************************************************/ -#ifndef CANON_HH -#define CANON_HH +#ifndef __LINUXCNC_NML_INTF_CANON_HH +#define __LINUXCNC_NML_INTF_CANON_HH #include // FILE #include @@ -19,10 +19,11 @@ #include #include -#include "emctool.h" +#include #include "canon_position.hh" #include // Just for EMCMOT_NUM_SPINDLES -#include "modal_state.hh" + +struct StateTag; /* This is the header file that all applications that use the diff --git a/include/nml_intf/canon_position.hh b/include/nml_intf/canon_position.hh index 0997857f9c4..23f3717853d 100644 --- a/include/nml_intf/canon_position.hh +++ b/include/nml_intf/canon_position.hh @@ -11,8 +11,8 @@ * Copyright (c) 2014 All rights reserved. ********************************************************************/ -#ifndef CANON_POSITION_HH -#define CANON_POSITION_HH +#ifndef __LINUXCNC_NML_INTF_CANON_POSITION_HH +#define __LINUXCNC_NML_INTF_CANON_POSITION_HH #include // FILE #include diff --git a/include/nml_intf/debugflags.h b/include/nml_intf/debugflags.h index d28fc6a5720..623fd65d422 100644 --- a/include/nml_intf/debugflags.h +++ b/include/nml_intf/debugflags.h @@ -19,7 +19,8 @@ // factored out from emcglb.h so subsystems not requiring the // emcglb.h defines may include them as well - +#ifndef __LINUXCNC_NML_INTF_DEBUGFLAGS_H +#define __LINUXCNC_NML_INTF_DEBUGFLAGS_H #define EMC_DEBUG_CONFIG 0x00000002 #define EMC_DEBUG_VERSIONS 0x00000008 @@ -48,3 +49,5 @@ #define LOG_TIME 1 #define LOG_PID 2 #define LOG_FILENAME 4 // and line + +#endif diff --git a/include/nml_intf/emc.hh b/include/nml_intf/emc.hh index 2037aba3a62..cd52c662293 100644 --- a/include/nml_intf/emc.hh +++ b/include/nml_intf/emc.hh @@ -12,14 +12,15 @@ * * Last change: ********************************************************************/ -#ifndef EMC_HH -#define EMC_HH +#ifndef __LINUXCNC_NML_INTF_EMC_HH +#define __LINUXCNC_NML_INTF_EMC_HH #include // EMC_JOINT_MAX, EMC_AXIS_MAX -#include "libnml/nml/nml_type.hh" +#include #include #include -#include "modal_state.hh" + +struct StateTag; // Forward class declarations class EMC_JOINT_STAT; diff --git a/include/nml_intf/emc_nml.hh b/include/nml_intf/emc_nml.hh index 2f91f26cb91..401b4589de1 100644 --- a/include/nml_intf/emc_nml.hh +++ b/include/nml_intf/emc_nml.hh @@ -12,14 +12,15 @@ * * Last change: ********************************************************************/ -#ifndef EMC_NML_HH -#define EMC_NML_HH +#ifndef __LINUXCNC_NML_INTF_EMC_NML_HH +#define __LINUXCNC_NML_INTF_EMC_NML_HH + #include #include #include // SWITCHKINS_MAX_TYPES #include "emc.hh" -#include "libnml/nml/cmd_msg.hh" -#include "libnml/nml/stat_msg.hh" +#include +#include #include "modal_state.hh" #include "canon.hh" // CANON_TOOL_TABLE, CANON_UNITS #include "interp_codes.h" // ACTIVE_G_CODES, etc diff --git a/include/nml_intf/emccfg.h b/include/nml_intf/emccfg.h index 1b68005f976..938cfa581c7 100644 --- a/include/nml_intf/emccfg.h +++ b/include/nml_intf/emccfg.h @@ -14,8 +14,8 @@ * * Last change: ********************************************************************/ -#ifndef EMCCFG_H -#define EMCCFG_H +#ifndef __LINUXCNC_NML_INTF_EMCCFG_H +#define __LINUXCNC_NML_INTF_EMCCFG_H #ifdef __cplusplus extern "C" { diff --git a/include/nml_intf/emcglb.h b/include/nml_intf/emcglb.h index 9ce5328e9ad..26f41b11857 100644 --- a/include/nml_intf/emcglb.h +++ b/include/nml_intf/emcglb.h @@ -12,8 +12,8 @@ * * Last change: ********************************************************************/ -#ifndef EMCGLB_H -#define EMCGLB_H +#ifndef __LINUXCNC_NML_INTF_EMCGLB_H +#define __LINUXCNC_NML_INTF_EMCGLB_H #include /* M_PI */ #include /* LINELEN */ diff --git a/include/nml_intf/emctool.h b/include/nml_intf/emctool.h index 39353685028..b093da2ac80 100644 --- a/include/nml_intf/emctool.h +++ b/include/nml_intf/emctool.h @@ -14,8 +14,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#ifndef EMCTOOL_H -#define EMCTOOL_H +#ifndef __LINUXCNC_NML_INTF_EMCTOOL_H +#define __LINUXCNC_NML_INTF_EMCTOOL_H #include diff --git a/include/nml_intf/modal_state.hh b/include/nml_intf/modal_state.hh index 8b2faf468ae..a287465cc4d 100644 --- a/include/nml_intf/modal_state.hh +++ b/include/nml_intf/modal_state.hh @@ -20,8 +20,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************************/ -#ifndef MODAL_STATE_HH -#define MODAL_STATE_HH +#ifndef __LINUXCNC_NML_INTF_MODAL_STATE_HH +#define __LINUXCNC_NML_INTF_MODAL_STATE_HH + #include #include diff --git a/include/nml_intf/state_tag.h b/include/nml_intf/state_tag.h index 2e2842733d1..bbff9c7d909 100644 --- a/include/nml_intf/state_tag.h +++ b/include/nml_intf/state_tag.h @@ -23,8 +23,8 @@ ********************************************************************/ -#ifndef STATE_TAG_H -#define STATE_TAG_H +#ifndef __LINUXCNC_NML_INTF_STATE_TAG_H +#define __LINUXCNC_NML_INTF_STATE_TAG_H #include diff --git a/include/rcs_status.hh b/include/rcs_status.hh index 4112ec1d443..8cdeff507e3 100644 --- a/include/rcs_status.hh +++ b/include/rcs_status.hh @@ -10,8 +10,8 @@ * License: GPL Version 2 * System: Linux ********************************************************************/ -#ifndef LINUXCNC_RCS_STATUS_HH -#define LINUXCNC_RCS_STATUS_HH +#ifndef __LINUXCNC_RCS_STATUS_HH +#define __LINUXCNC_RCS_STATUS_HH enum class RCS_STATUS : int { /* Originally from nml_mod.hh */ UNINITIALIZED = -1, diff --git a/src/emc/canterp/canterp.cc b/src/emc/canterp/canterp.cc index 8cf41d17d5f..7826e6fb9df 100644 --- a/src/emc/canterp/canterp.cc +++ b/src/emc/canterp/canterp.cc @@ -56,9 +56,9 @@ #include #include #include "nml_intf/interp_return.hh" -#include "nml_intf/canon.hh" +#include #include "rs274ngc/interp_base.hh" -#include "nml_intf/modal_state.hh" +#include static char the_command[LINELEN] = { 0 }; // our current command static char the_command_name[LINELEN] = { 0 }; // just the name part diff --git a/src/emc/ini/iniaxis.cc b/src/emc/ini/iniaxis.cc index d6ddb8acff1..66c31df345d 100644 --- a/src/emc/ini/iniaxis.cc +++ b/src/emc/ini/iniaxis.cc @@ -16,9 +16,9 @@ #include #include "logutil.hh" -#include "nml_intf/emc.hh" -#include "nml_intf/emcglb.h" -#include "nml_intf/emccfg.h" +#include +#include +#include #include #include diff --git a/src/emc/ini/iniaxis.hh b/src/emc/ini/iniaxis.hh index 0cc12efc6e7..c1d7b20956b 100644 --- a/src/emc/ini/iniaxis.hh +++ b/src/emc/ini/iniaxis.hh @@ -14,7 +14,7 @@ #ifndef INIAXIS_HH #define INIAXIS_HH -#include "nml_intf/emc.hh" // EMC_AXIS_STAT +#include // EMC_AXIS_STAT /* initializes axis modules from INI file */ extern int iniAxis(int axis, const char *filename); diff --git a/src/emc/ini/inifile.cc b/src/emc/ini/inifile.cc index 530f5c907f1..158602e0036 100644 --- a/src/emc/ini/inifile.cc +++ b/src/emc/ini/inifile.cc @@ -30,7 +30,7 @@ #include -#include "nml_intf/emc.hh" +#include #include diff --git a/src/emc/ini/inihal.cc b/src/emc/ini/inihal.cc index e6a7d2ab175..b4c04991904 100644 --- a/src/emc/ini/inihal.cc +++ b/src/emc/ini/inihal.cc @@ -19,8 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ----------------------------------------------------------------------*/ #include "logutil.hh" -#include "nml_intf/emc.hh" -#include "nml_intf/emcglb.h" +#include +#include #include #include #include diff --git a/src/emc/ini/inijoint.cc b/src/emc/ini/inijoint.cc index b0c79c3ddc0..43b973b0e93 100644 --- a/src/emc/ini/inijoint.cc +++ b/src/emc/ini/inijoint.cc @@ -14,10 +14,10 @@ #include #include "logutil.hh" -#include "nml_intf/emc.hh" +#include #include -#include "nml_intf/emcglb.h" -#include "nml_intf/emccfg.h" +#include +#include #include #include "inihal.hh" diff --git a/src/emc/ini/inispindle.cc b/src/emc/ini/inispindle.cc index 8ee0bc141c3..8f9765f3594 100644 --- a/src/emc/ini/inispindle.cc +++ b/src/emc/ini/inispindle.cc @@ -17,10 +17,10 @@ #include #include "logutil.hh" -#include "nml_intf/emc.hh" +#include #include -#include "nml_intf/emcglb.h" -#include "nml_intf/emccfg.h" +#include +#include #include #include "inihal.hh" diff --git a/src/emc/ini/inispindle.hh b/src/emc/ini/inispindle.hh index a4e97b184bd..fdd8bd6ca08 100644 --- a/src/emc/ini/inispindle.hh +++ b/src/emc/ini/inispindle.hh @@ -14,7 +14,7 @@ #ifndef INISPINDLE_HH #define INISPINDLE_HH -#include "nml_intf/emc.hh" // EMC_AXIS_STAT +#include // EMC_AXIS_STAT /* initializes spindle modules from INI file */ extern int iniSpindle(int spindle, const char *filename); diff --git a/src/emc/ini/initraj.cc b/src/emc/ini/initraj.cc index 36537e70bdc..6cdc3409548 100644 --- a/src/emc/ini/initraj.cc +++ b/src/emc/ini/initraj.cc @@ -14,10 +14,10 @@ #include #include "logutil.hh" -#include "nml_intf/emc.hh" +#include #include #include -#include "nml_intf/emcglb.h" +#include #include #include "inihal.hh" diff --git a/src/emc/logutil.hh b/src/emc/logutil.hh index 5a9cbaf8109..98a89a9ecba 100644 --- a/src/emc/logutil.hh +++ b/src/emc/logutil.hh @@ -21,7 +21,7 @@ #include #include -#include "nml_intf/emcglb.h" // emc_debug +#include // emc_debug namespace linuxcnc { diff --git a/src/emc/motion/control.c b/src/emc/motion/control.c index 22cbfdaf5a4..e8650c5de21 100644 --- a/src/emc/motion/control.c +++ b/src/emc/motion/control.c @@ -33,7 +33,7 @@ #include "mot_priv.h" #include "homing.h" #include "axis.h" -#include "../nml_intf/state_tag.h" +#include // Mark strings for translation, but defer translation to userspace #define _(s) (s) diff --git a/src/emc/motion/motion.h b/src/emc/motion/motion.h index 49cb1b00a94..3e6b39e4712 100644 --- a/src/emc/motion/motion.h +++ b/src/emc/motion/motion.h @@ -72,7 +72,7 @@ to another. #include #include "simple_tp.h" -#include "../nml_intf/state_tag.h" +#include #include "../tp/tp_types.h" // define a special value to denote an invalid motion ID diff --git a/src/emc/nml_intf/canon_position.cc b/src/emc/nml_intf/canon_position.cc index fac91b9044e..a346b84f765 100644 --- a/src/emc/nml_intf/canon_position.cc +++ b/src/emc/nml_intf/canon_position.cc @@ -14,7 +14,7 @@ #include #include -#include "canon_position.hh" +#include static double noElement = 0.0; diff --git a/src/emc/nml_intf/emc.cc b/src/emc/nml_intf/emc.cc index 3716cde7aee..447bda1fc36 100644 --- a/src/emc/nml_intf/emc.cc +++ b/src/emc/nml_intf/emc.cc @@ -20,11 +20,11 @@ // Include all NML, CMS, and RCS classes and functions // Include command and status message definitions -#include "canon.hh" -#include "emc.hh" -#include "emc_nml.hh" +#include +#include +#include #include -#include "libnml/cms/cms.hh" +#include // // Note: Many methods have a cppcheck suppress line marking to suppress the diff --git a/src/emc/nml_intf/emcargs.cc b/src/emc/nml_intf/emcargs.cc index c7ff87da040..67ee8d8aabe 100644 --- a/src/emc/nml_intf/emcargs.cc +++ b/src/emc/nml_intf/emcargs.cc @@ -16,8 +16,8 @@ #include "strutil.hh" #include /* strcpy() */ #include /* fgets() */ -#include "libnml/nml/nml.hh" /* nmlSetHostAlias */ -#include "emcglb.h" /* these decls */ +#include /* nmlSetHostAlias */ +#include /* these decls */ using namespace linuxcnc; diff --git a/src/emc/nml_intf/emcglb.c b/src/emc/nml_intf/emcglb.c index d07825535ba..acbcaeb0384 100644 --- a/src/emc/nml_intf/emcglb.c +++ b/src/emc/nml_intf/emcglb.c @@ -14,8 +14,8 @@ ********************************************************************/ #include "config.h" -#include "emcglb.h" /* these decls */ -#include "emccfg.h" /* their initial values */ +#include /* these decls */ +#include /* their initial values */ #include /* EmcPose */ char emc_inifile[LINELEN] = DEFAULT_EMC_INIFILE; diff --git a/src/emc/nml_intf/emcops.cc b/src/emc/nml_intf/emcops.cc index 2fe4fe31a0e..b28141dce4d 100644 --- a/src/emc/nml_intf/emcops.cc +++ b/src/emc/nml_intf/emcops.cc @@ -15,8 +15,8 @@ * Last change: ********************************************************************/ -#include "emc.hh" -#include "emc_nml.hh" +#include +#include // EMC_STAT is written to the emcStatus NML buffer every cycle. If it outgrows // that buffer, NML::write() rejects the message and status silently stops diff --git a/src/emc/nml_intf/interpl.hh b/src/emc/nml_intf/interpl.hh index 55b337a2335..40b07533f54 100644 --- a/src/emc/nml_intf/interpl.hh +++ b/src/emc/nml_intf/interpl.hh @@ -25,8 +25,8 @@ #include #include -#include "debugflags.h" // EMC_DEBUG_INTERP_LIST -#include "emcglb.h" // emc_debug +#include // EMC_DEBUG_INTERP_LIST +#include // emc_debug /** * Per-message-type hooks for InterpList. diff --git a/src/emc/nml_intf/interpl_nml.hh b/src/emc/nml_intf/interpl_nml.hh index d8462c36c92..051d67351b3 100644 --- a/src/emc/nml_intf/interpl_nml.hh +++ b/src/emc/nml_intf/interpl_nml.hh @@ -14,8 +14,8 @@ #define INTERPL_NML_HH #include "interpl.hh" -#include "emc.hh" // emc_symbol_lookup() -#include "libnml/nml/nmlmsg.hh" // class NMLmsg +#include // emc_symbol_lookup() +#include // class NMLmsg template <> struct InterpListTraits { diff --git a/src/emc/nml_intf/modal_state.cc b/src/emc/nml_intf/modal_state.cc index ce724a2f38d..fb6b410b148 100644 --- a/src/emc/nml_intf/modal_state.cc +++ b/src/emc/nml_intf/modal_state.cc @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************************/ -#include "modal_state.hh" +#include #include StateTag::StateTag(): flags(0) diff --git a/src/emc/nml_intf/nurbs_math.hh b/src/emc/nml_intf/nurbs_math.hh index 659f8566ecc..a26212b97b3 100644 --- a/src/emc/nml_intf/nurbs_math.hh +++ b/src/emc/nml_intf/nurbs_math.hh @@ -11,7 +11,7 @@ #define NURBS_MATH_HH #include -#include "canon.hh" // NURBS_CONTROL_POINT, NURBS_G6_CONTROL_POINT, NURBS_PLANE_POINT +#include // NURBS_CONTROL_POINT, NURBS_G6_CONTROL_POINT, NURBS_PLANE_POINT /* Additional functions needed to calculate nurbs G5 points */ diff --git a/src/emc/rs274ngc/gcode_renderer.cc b/src/emc/rs274ngc/gcode_renderer.cc index 816ad639011..2c08b9b9853 100644 --- a/src/emc/rs274ngc/gcode_renderer.cc +++ b/src/emc/rs274ngc/gcode_renderer.cc @@ -29,7 +29,7 @@ #include #include -#include "nml_intf/canon.hh" +#include namespace py = pybind11; diff --git a/src/emc/rs274ngc/gcodemodule.cc b/src/emc/rs274ngc/gcodemodule.cc index edc607e09f8..6e007ffc594 100644 --- a/src/emc/rs274ngc/gcodemodule.cc +++ b/src/emc/rs274ngc/gcodemodule.cc @@ -56,7 +56,7 @@ #include "rs274ngc.hh" #include "rs274ngc_interp.hh" #include "nml_intf/interp_return.hh" -#include "nml_intf/canon.hh" +#include #include "nml_intf/nurbs_math.hh" #include #include // KINEMATICS_IDENTITY diff --git a/src/emc/rs274ngc/interp_base.hh b/src/emc/rs274ngc/interp_base.hh index f85759c2ce7..43ce99878fa 100644 --- a/src/emc/rs274ngc/interp_base.hh +++ b/src/emc/rs274ngc/interp_base.hh @@ -24,8 +24,8 @@ #include #include #include -#include "../nml_intf/modal_state.hh" -#include "../nml_intf/interp_codes.h" +#include +#include class InterpBase : boost::noncopyable { public: diff --git a/src/emc/rs274ngc/interp_internal.hh b/src/emc/rs274ngc/interp_internal.hh index 51516c7a2a4..9481e67a731 100644 --- a/src/emc/rs274ngc/interp_internal.hh +++ b/src/emc/rs274ngc/interp_internal.hh @@ -22,7 +22,7 @@ #include #include #include -#include "nml_intf/canon.hh" +#include #include #include "libintl.h" #include diff --git a/src/emc/rs274ngc/nurbs_additional_functions.cc b/src/emc/rs274ngc/nurbs_additional_functions.cc index 8b4a4340ccb..45782825ea7 100644 --- a/src/emc/rs274ngc/nurbs_additional_functions.cc +++ b/src/emc/rs274ngc/nurbs_additional_functions.cc @@ -12,7 +12,7 @@ #include #include -#include "nml_intf/canon.hh" +#include #include "nml_intf/nurbs_math.hh" static void unit(NURBS_PLANE_POINT &p) diff --git a/src/emc/rs274ngc/rs274ngc.hh b/src/emc/rs274ngc/rs274ngc.hh index 9d022f9324e..6403df5776a 100644 --- a/src/emc/rs274ngc/rs274ngc.hh +++ b/src/emc/rs274ngc/rs274ngc.hh @@ -22,9 +22,9 @@ /**********************/ #include -#include "nml_intf/canon.hh" -#include "nml_intf/emc.hh" -#include "nml_intf/debugflags.h" +#include +#include +#include #include "interp_fwd.hh" // Declare class so that we can use it in the typedef. diff --git a/src/emc/sai/driver.cc b/src/emc/sai/driver.cc index 39ea1cd4fe7..39ed75a1e26 100644 --- a/src/emc/sai/driver.cc +++ b/src/emc/sai/driver.cc @@ -22,7 +22,7 @@ #include "rs274ngc/rs274ngc_interp.hh" #include "rs274ngc/rs274ngc_return.hh" #include -#include "nml_intf/canon.hh" // _parameter_file_name +#include // _parameter_file_name #include "config.h" // LINELEN #include /* gets, etc. */ #include /* exit */ diff --git a/src/emc/sai/dummyemcstat.cc b/src/emc/sai/dummyemcstat.cc index aee1c813d30..8e31dee0edb 100644 --- a/src/emc/sai/dummyemcstat.cc +++ b/src/emc/sai/dummyemcstat.cc @@ -18,8 +18,8 @@ // keep linker happy so TaskMod can be resolved #include -#include "nml_intf/emc.hh" // EMC NML -#include "nml_intf/emc_nml.hh" +#include // EMC NML +#include #include "rs274ngc/rs274ngc.hh" #include "rs274ngc/rs274ngc_interp.hh" diff --git a/src/emc/sai/saicanon.hh b/src/emc/sai/saicanon.hh index 56981652405..08e5e77c815 100644 --- a/src/emc/sai/saicanon.hh +++ b/src/emc/sai/saicanon.hh @@ -4,7 +4,7 @@ #include #include #include "rs274ngc/interp_fwd.hh" -#include "nml_intf/canon.hh" +#include struct StandaloneInterpInternals; class InterpBase; diff --git a/src/emc/task/emccanon.cc b/src/emc/task/emccanon.cc index c2d96933119..507a3f0e5ac 100644 --- a/src/emc/task/emccanon.cc +++ b/src/emc/task/emccanon.cc @@ -57,15 +57,15 @@ #include #include #include // isspace() -#include "nml_intf/emc.hh" // EMC NML -#include "nml_intf/emc_nml.hh" +#include // EMC NML +#include #include // SWITCHKINS_MAX_TYPES -#include "nml_intf/canon.hh" +#include #include "nml_intf/nurbs_math.hh" -#include "nml_intf/canon_position.hh" // data type for a machine position +#include // data type for a machine position #include "nml_intf/interpl_nml.hh" // interp_list -#include "nml_intf/emcglb.h" // TRAJ_MAX_VELOCITY -#include "nml_intf/modal_state.hh" +#include // TRAJ_MAX_VELOCITY +#include #include "tooldata/tooldata.hh" #include #include @@ -101,7 +101,7 @@ static int debug_velacc = 0; static StateTag _tag; void UPDATE_TAG(const StateTag& tag) { - canon_debug("--Got UPDATE_TAG: %d--\n",tag.fields[GM_FIELD_LINE_NUMBER]); + canon_debug("--Got UPDATE_TAG: %ld--\n", (long)tag.fields[GM_FIELD_LINE_NUMBER]); _tag = tag; } diff --git a/src/emc/task/emcsvr.cc b/src/emc/task/emcsvr.cc index b9ecf5fd9d4..28ea5ed4bfd 100644 --- a/src/emc/task/emcsvr.cc +++ b/src/emc/task/emcsvr.cc @@ -18,12 +18,12 @@ #include #include -#include "nml_intf/emc.hh" // EMC NML -#include "nml_intf/emc_nml.hh" // EMC NML -#include "nml_intf/emcglb.h" // emcGetArgs(), EMC_NMLFILE +#include // EMC NML +#include // EMC NML +#include // emcGetArgs(), EMC_NMLFILE #include "logutil.hh" #include -#include "libnml/nml/nml_oi.hh" +#include #include "timeutil.hh" #include "libnml/nml/nml_srv.hh" // run_nml_servers() #include diff --git a/src/emc/task/emctask.cc b/src/emc/task/emctask.cc index 2b4490aca48..9b240e1a597 100644 --- a/src/emc/task/emctask.cc +++ b/src/emc/task/emctask.cc @@ -23,11 +23,11 @@ #include #include -#include "nml_intf/emc.hh" // EMC NML -#include "nml_intf/emc_nml.hh" -#include "nml_intf/emcglb.h" // EMC_INIFILE +#include // EMC NML +#include +#include // EMC_INIFILE #include "nml_intf/interpl_nml.hh" // NML_INTERP_LIST, interp_list -#include "nml_intf/canon.hh" // CANON_VECTOR, GET_PROGRAM_ORIGIN() +#include // CANON_VECTOR, GET_PROGRAM_ORIGIN() #include "rs274ngc/rs274ngc_interp.hh" // the interpreter #include "rs274ngc/interp_internal.hh" // G_20, G_21 #include "nml_intf/interp_return.hh" // INTERP_FILE_NOT_OPEN diff --git a/src/emc/task/emctaskmain.cc b/src/emc/task/emctaskmain.cc index c6304738767..756e54d0c18 100644 --- a/src/emc/task/emctaskmain.cc +++ b/src/emc/task/emctaskmain.cc @@ -70,17 +70,17 @@ fpu_control_t __fpu_control = _FPU_IEEE & ~(_FPU_MASK_IM | _FPU_MASK_ZM | _FPU_M #endif #include "config.h" -#include "rcs_status.hh" // enum class RCS_STATUS -#include "nml_intf/emc.hh" // EMC NML -#include "nml_intf/emc_nml.hh" -#include "nml_intf/canon.hh" // CANON_TOOL_TABLE stuff +#include // enum class RCS_STATUS +#include // EMC NML +#include +#include // CANON_TOOL_TABLE stuff #include #include "usr_intf/mapini.hh" #include "nml_intf/interpl_nml.hh" // NML_INTERP_LIST, interp_list -#include "nml_intf/emcglb.h" // EMC_INIFILE,NMLFILE, EMC_TASK_CYCLE_TIME +#include // EMC_INIFILE,NMLFILE, EMC_TASK_CYCLE_TIME #include "nml_intf/interp_return.hh" // public interpreter return values #include "rs274ngc/interp_internal.hh" // interpreter private definitions -#include "libnml/nml/nml_oi.hh" +#include #include "timeutil.hh" #include "task.hh" // emcTaskCommand etc #include "taskclass.hh" diff --git a/src/emc/task/task.hh b/src/emc/task/task.hh index d8c619cdb50..117dc4a62fe 100644 --- a/src/emc/task/task.hh +++ b/src/emc/task/task.hh @@ -16,7 +16,7 @@ #ifndef EMC_TASK_HH #define EMC_TASK_HH #include "taskclass.hh" -#include "nml_intf/emc_nml.hh" +#include #include extern std::unique_ptr emcTaskCommand; diff --git a/src/emc/task/taskclass.cc b/src/emc/task/taskclass.cc index cdda43a8036..39e9bfc57ad 100644 --- a/src/emc/task/taskclass.cc +++ b/src/emc/task/taskclass.cc @@ -20,9 +20,9 @@ #include // malloc() #include -#include "rcs_status.hh" // enum class RCS_STATUS +#include // enum class RCS_STATUS -#include "nml_intf/emcglb.h" // EMC_INIFILE +#include // EMC_INIFILE #include "pythonplugin/python_plugin.hh" #include "taskclass.hh" diff --git a/src/emc/task/taskclass.hh b/src/emc/task/taskclass.hh index 8e7ee047f01..0c080af8d93 100644 --- a/src/emc/task/taskclass.hh +++ b/src/emc/task/taskclass.hh @@ -18,7 +18,7 @@ #ifndef TASKCLASS_HH #define TASKCLASS_HH -#include "nml_intf/emc.hh" +#include #include #include #include "tooldata/tooldata.hh" diff --git a/src/emc/task/taskintf.cc b/src/emc/task/taskintf.cc index c291547cf39..4142e04ff4d 100644 --- a/src/emc/task/taskintf.cc +++ b/src/emc/task/taskintf.cc @@ -23,10 +23,10 @@ // etc. #include "motion/motion.h" // emcmot_command_t,STATUS, etc. #include "motion/homing.h" -#include "nml_intf/emc.hh" -#include "nml_intf/emccfg.h" // EMC_INIFILE -#include "nml_intf/emcglb.h" // EMC_INIFILE -#include "nml_intf/emc_nml.hh" +#include +#include // EMC_INIFILE +#include // EMC_INIFILE +#include #include "timeutil.hh" #include #include "ini/iniaxis.hh" diff --git a/src/emc/tooldata/tool_watch.cc b/src/emc/tooldata/tool_watch.cc index 4cea7e21412..f3b2ea5a5fb 100644 --- a/src/emc/tooldata/tool_watch.cc +++ b/src/emc/tooldata/tool_watch.cc @@ -20,8 +20,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include -#include "nml_intf/emc.hh" -#include "nml_intf/emc_nml.hh" +#include +#include #include #include "config.h" diff --git a/src/emc/tooldata/tooldata.hh b/src/emc/tooldata/tooldata.hh index 524bd8b1499..344af10ff9f 100644 --- a/src/emc/tooldata/tooldata.hh +++ b/src/emc/tooldata/tooldata.hh @@ -24,8 +24,8 @@ #ifndef TOOL_DATA_H #define TOOL_DATA_H -#include "nml_intf/canon.hh" -#include "nml_intf/emc_nml.hh" +#include +#include #ifdef __cplusplus extern"C" { diff --git a/src/emc/tp/tc_types.h b/src/emc/tp/tc_types.h index 53e11266d31..ad283afc3d1 100644 --- a/src/emc/tp/tc_types.h +++ b/src/emc/tp/tc_types.h @@ -18,7 +18,7 @@ #include #include "spherical_arc.h" -#include "../nml_intf/state_tag.h" +#include #define BLEND_DIST_FRACTION 0.5 /* values for endFlag */ diff --git a/src/emc/usr_intf/axis/extensions/emcmodule.cc b/src/emc/usr_intf/axis/extensions/emcmodule.cc index 4efc4c5b2a1..fc09c67c770 100644 --- a/src/emc/usr_intf/axis/extensions/emcmodule.cc +++ b/src/emc/usr_intf/axis/extensions/emcmodule.cc @@ -25,15 +25,16 @@ #include #include #include "config.h" -#include "rcs_status.hh" -#include "nml_intf/emc.hh" -#include "nml_intf/emc_nml.hh" -#include "nml_intf/debugflags.h" +#include +#include +#include +#include #include #include "config.h" #include #include "timeutil.hh" -#include "libnml/nml/nml_oi.hh" +#include +#include #include "libnml/rcs/rcs_print.hh" #include #include diff --git a/src/emc/usr_intf/emclcd.cc b/src/emc/usr_intf/emclcd.cc index 67305fa289e..aa9292d8263 100644 --- a/src/emc/usr_intf/emclcd.cc +++ b/src/emc/usr_intf/emclcd.cc @@ -46,10 +46,10 @@ #include #include // PM_POSE, TO_RAD -#include "nml_intf/emc.hh" // EMC NML -#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 // EMC NML +#include // CANON_UNITS, CANON_UNITS_INCHES,MM,CM +#include // EMC_NMLFILE, TRAJ_MAX_VELOCITY, etc. +#include // DEFAULT_TRAJ_MAX_VELOCITY #include "config.h" // Standard path definitions #include "sockets.hh" // TCP/IP common socket functions #include "shcom.hh" // Common NML messaging routines diff --git a/src/emc/usr_intf/emcrsh.cc b/src/emc/usr_intf/emcrsh.cc index 88550e56177..409c267f0b5 100644 --- a/src/emc/usr_intf/emcrsh.cc +++ b/src/emc/usr_intf/emcrsh.cc @@ -39,7 +39,7 @@ #include #include "shcom.hh" -#include "nml_intf/emcglb.h" +#include #include #include "timeutil.hh" diff --git a/src/emc/usr_intf/emcsched.cc b/src/emc/usr_intf/emcsched.cc index 00465cd1b7c..3347ead3eb2 100644 --- a/src/emc/usr_intf/emcsched.cc +++ b/src/emc/usr_intf/emcsched.cc @@ -26,11 +26,11 @@ #include #include -#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 // EMC NML +#include +#include // CANON_UNITS, CANON_UNITS_INCHES,MM,CM +#include // EMC_NMLFILE, TRAJ_MAX_VELOCITY, etc. +#include // DEFAULT_TRAJ_MAX_VELOCITY #include "shcom.hh" // Common NML communications functions #include "emcsched.hh" // Common scheduling functions diff --git a/src/emc/usr_intf/emcsched.hh b/src/emc/usr_intf/emcsched.hh index 002facc4d41..36be9cce17e 100644 --- a/src/emc/usr_intf/emcsched.hh +++ b/src/emc/usr_intf/emcsched.hh @@ -17,8 +17,8 @@ #ifndef EMCSCHED_HH #define EMCSCHED_HH -#include "nml_intf/emc_nml.hh" -#include "libnml/nml/nml_oi.hh" // NML_ERROR_LEN +#include +#include // NML_ERROR_LEN #include using namespace std; diff --git a/src/emc/usr_intf/emcsh.cc b/src/emc/usr_intf/emcsh.cc index e7e20296f37..60d0bf07e76 100644 --- a/src/emc/usr_intf/emcsh.cc +++ b/src/emc/usr_intf/emcsh.cc @@ -25,11 +25,11 @@ #include #include // PM_POSE, TO_RAD -#include "nml_intf/emc.hh" // EMC NML -#include "nml_intf/emc_nml.hh" // EMC NML -#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 // EMC NML +#include // EMC NML +#include // CANON_UNITS, CANON_UNITS_INCHES,MM,CM +#include // EMC_NMLFILE, TRAJ_MAX_VELOCITY, etc. +#include // DEFAULT_TRAJ_MAX_VELOCITY #include #include "timeutil.hh" diff --git a/src/emc/usr_intf/halui.cc b/src/emc/usr_intf/halui.cc index b5f0a1e76c6..48170250ec5 100644 --- a/src/emc/usr_intf/halui.cc +++ b/src/emc/usr_intf/halui.cc @@ -27,14 +27,14 @@ #include /* access to HAL functions/definitions */ #include /* rtapi_print_msg */ -#include "rcs_status.hh" +#include #include // PM_POSE, TO_RAD -#include "nml_intf/emc.hh" // EMC NML -#include "nml_intf/emc_nml.hh" -#include "nml_intf/emcglb.h" // EMC_NMLFILE, TRAJ_MAX_VELOCITY, etc. -#include "nml_intf/emccfg.h" // DEFAULT_TRAJ_MAX_VELOCITY +#include // EMC NML +#include +#include // EMC_NMLFILE, TRAJ_MAX_VELOCITY, etc. +#include // DEFAULT_TRAJ_MAX_VELOCITY #include -#include "libnml/nml/nml_oi.hh" +#include #include "timeutil.hh" #include #include "mapini.hh" diff --git a/src/emc/usr_intf/schedrmt.cc b/src/emc/usr_intf/schedrmt.cc index 78da4316da4..fcf04f06e18 100644 --- a/src/emc/usr_intf/schedrmt.cc +++ b/src/emc/usr_intf/schedrmt.cc @@ -35,10 +35,10 @@ #include #include // PM_POSE, TO_RAD -#include "nml_intf/emc.hh" // EMC NML -#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 // EMC NML +#include // CANON_UNITS, CANON_UNITS_INCHES,MM,CM +#include // EMC_NMLFILE, TRAJ_MAX_VELOCITY, etc. +#include // DEFAULT_TRAJ_MAX_VELOCITY #include "shcom.hh" // NML Messaging functions #include "emcsched.hh" diff --git a/src/emc/usr_intf/shcom.cc b/src/emc/usr_intf/shcom.cc index 0c96ebc5493..49f1650787e 100644 --- a/src/emc/usr_intf/shcom.cc +++ b/src/emc/usr_intf/shcom.cc @@ -22,13 +22,14 @@ #include #include -#include "rcs_status.hh" -#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 +#include // EMC NML +#include +#include // CANON_UNITS, CANON_UNITS_INCHES,MM,CM +#include // EMC_NMLFILE, TRAJ_MAX_VELOCITY, etc. +#include // DEFAULT_TRAJ_MAX_VELOCITY +#include // nmlErrorFormat, NML_ERROR, etc +#include // nmlErrorFormat, NML_ERROR, etc #include "timeutil.hh" // esleep #include "mapini.hh" #include "shcom.hh" // Common NML communications functions diff --git a/src/emc/usr_intf/shcom.hh b/src/emc/usr_intf/shcom.hh index 9a7abd4fda4..8d731afd717 100644 --- a/src/emc/usr_intf/shcom.hh +++ b/src/emc/usr_intf/shcom.hh @@ -22,8 +22,8 @@ #include // INCH_PER_MM #include -#include "nml_intf/emc_nml.hh" -#include "libnml/nml/nml_oi.hh" // NML_ERROR_LEN +#include +#include // NML_ERROR_LEN #include "unitenum.hh" static inline bool CLOSE(double a, double b, double eps) diff --git a/src/libnml/buffer/locmem.cc b/src/libnml/buffer/locmem.cc index b0107cf7f73..3505d9b59a0 100644 --- a/src/libnml/buffer/locmem.cc +++ b/src/libnml/buffer/locmem.cc @@ -19,8 +19,6 @@ ********************************************************************/ #include "locmem.hh" // class LOCMEM -#include "libnml/cms/cms.hh" // class CMS -#include "libnml/linklist/linklist.hh" // class LinkedList #include "libnml/rcs/rcs_print.hh" // rcs_print_error() #include // malloc() diff --git a/src/libnml/buffer/locmem.hh b/src/libnml/buffer/locmem.hh index 88731e8e3e0..49d913e477a 100644 --- a/src/libnml/buffer/locmem.hh +++ b/src/libnml/buffer/locmem.hh @@ -21,7 +21,7 @@ #ifndef LOCMEM_HH #define LOCMEM_HH -#include "libnml/cms/cms.hh" // class CMS +#include // class CMS #include "libnml/linklist/linklist.hh" // class LinkedList struct BUFFERS_LIST_NODE { diff --git a/src/libnml/buffer/phantom.cc b/src/libnml/buffer/phantom.cc index 97b2ec0334f..ee7cf7629b8 100644 --- a/src/libnml/buffer/phantom.cc +++ b/src/libnml/buffer/phantom.cc @@ -12,7 +12,6 @@ * Last change: ********************************************************************/ -#include "libnml/cms/cms.hh" /* enum CMS_STATUS */ #include "phantom.hh" /* class PHANTOMMEM */ PHANTOMMEM::PHANTOMMEM(const char *bufline, const char *procline):CMS(bufline, procline) diff --git a/src/libnml/buffer/phantom.hh b/src/libnml/buffer/phantom.hh index 1422702ef8d..78b27629288 100644 --- a/src/libnml/buffer/phantom.hh +++ b/src/libnml/buffer/phantom.hh @@ -15,7 +15,7 @@ #ifndef PHANTOM_HH #define PHANTOM_HH -#include "libnml/cms/cms.hh" +#include class PHANTOMMEM:public CMS { public: diff --git a/src/libnml/buffer/shmem.cc b/src/libnml/buffer/shmem.cc index 7c6dce9890b..58aeb7d583d 100644 --- a/src/libnml/buffer/shmem.cc +++ b/src/libnml/buffer/shmem.cc @@ -27,7 +27,6 @@ #include "physmem.hh" /* PHYSMEM_HANDLE */ #include "libnml/rcs/rcs_print.hh" /* rcs_print_error() */ -#include "libnml/cms/cms.hh" /* class CMS */ #include "shmem.hh" /* class SHMEM */ #include "libnml/os_intf/shm.hh" /* class RCS_SHAREDMEM */ //#include "sem.hh" /* class RCS_SEMAPHORE */ diff --git a/src/libnml/buffer/shmem.hh b/src/libnml/buffer/shmem.hh index a22f8862df0..ee518f1dd8b 100644 --- a/src/libnml/buffer/shmem.hh +++ b/src/libnml/buffer/shmem.hh @@ -23,7 +23,7 @@ #include /* size_t */ #include /* key_t */ -#include "libnml/cms/cms.hh" /* class CMS */ +#include /* class CMS */ #include "libnml/os_intf/shm.hh" /* class RCS_SHAREDMEM */ #include "memsem.hh" /* struct mem_access_object */ diff --git a/src/libnml/buffer/tcpmem.hh b/src/libnml/buffer/tcpmem.hh index 1ec8f280fa1..b2010412c95 100644 --- a/src/libnml/buffer/tcpmem.hh +++ b/src/libnml/buffer/tcpmem.hh @@ -15,7 +15,7 @@ #ifndef TCPMEM_HH #define TCPMEM_HH -#include "libnml/cms/cms.hh" /* class CMS */ +#include /* class CMS */ #include "rem_msg.hh" // REMOTE_CMS_REQUEST_TYPE class TCPMEM:public CMS { diff --git a/src/libnml/cms/cms.cc b/src/libnml/cms/cms.cc index 6e4c50d0a7e..1b197f5dd2c 100644 --- a/src/libnml/cms/cms.cc +++ b/src/libnml/cms/cms.cc @@ -26,7 +26,7 @@ #include #include "cms_cfg.hh" -#include "cms.hh" /* class CMS */ +#include /* class CMS */ #include "cms_up.hh" /* class CMS_UPDATER */ #include "cms_xup.hh" /* class CMS_XDR_UPDATER */ #include "cms_aup.hh" /* class CMS_ASCII_UPDATER */ diff --git a/src/libnml/cms/cms_aup.cc b/src/libnml/cms/cms_aup.cc index 73fb74cdf78..c4d77d4be00 100644 --- a/src/libnml/cms/cms_aup.cc +++ b/src/libnml/cms/cms_aup.cc @@ -28,7 +28,7 @@ #include /* sprintf() */ #include /* isspace() */ -#include "cms.hh" /* class CMS */ +#include /* class CMS */ #include "cms_aup.hh" /* class CMS_ASCII_UPDATER */ #include "libnml/rcs/rcs_print.hh" /* rcs_print_error() */ diff --git a/src/libnml/cms/cms_cfg.cc b/src/libnml/cms/cms_cfg.cc index 404c5abd5d9..08a07207053 100644 --- a/src/libnml/cms/cms_cfg.cc +++ b/src/libnml/cms/cms_cfg.cc @@ -27,7 +27,7 @@ extern int verbose_nml_error_messages; #include /* sockaddr_in */ #include -#include "cms.hh" /* class CMS */ +#include /* class CMS */ #include "cms_cfg.hh" /* TCP stands for "Transmission Control Protocol". This is the recommended diff --git a/src/libnml/cms/cms_dup.cc b/src/libnml/cms/cms_dup.cc index f649fe8a302..35c18a4a21c 100644 --- a/src/libnml/cms/cms_dup.cc +++ b/src/libnml/cms/cms_dup.cc @@ -23,7 +23,7 @@ #include /* sprintf() */ #include /* isspace() */ -#include "cms.hh" /* class CMS */ +#include /* class CMS */ #include "cms_dup.hh" /* class CMS_DISPLAY_ASCII_UPDATER */ #include "libnml/rcs/rcs_print.hh" /* rcs_print_error() */ #define DEFAULT_WARNING_COUNT_MAX 100 diff --git a/src/libnml/cms/cms_in.cc b/src/libnml/cms/cms_in.cc index eee6a2383ed..1352281d06d 100644 --- a/src/libnml/cms/cms_in.cc +++ b/src/libnml/cms/cms_in.cc @@ -32,7 +32,7 @@ * Last change: ********************************************************************/ -#include "cms.hh" /* class CMS */ +#include /* class CMS */ #include "cmsdiag.hh" // class CMS_DIAG_PROC_INFO, CMS_DIAG_HEADER #include "libnml/rcs/rcs_print.hh" /* rcs_print_error() */ #include "libnml/buffer/physmem.hh" /* class PHYSMEM_HANDLE */ diff --git a/src/libnml/cms/cms_srv.cc b/src/libnml/cms/cms_srv.cc index 6f37e974b01..55362b79687 100644 --- a/src/libnml/cms/cms_srv.cc +++ b/src/libnml/cms/cms_srv.cc @@ -24,7 +24,7 @@ #include /* waitpid() */ #include /* sigvec(), struct sigvec, SIGINT, kill() */ -#include "cms.hh" /* class CMS */ +#include /* class CMS */ #include "libnml/buffer/rem_msg.hh" /* struct REMOTE_READ_REQUEST, */ /* struct REMOTE_WRITE_REQUEST, */ #include "cms_srv.hh" /* class CMS_SERVER */ diff --git a/src/libnml/cms/cms_srv.hh b/src/libnml/cms/cms_srv.hh index 8f89052bfd7..7a824f79c8f 100644 --- a/src/libnml/cms/cms_srv.hh +++ b/src/libnml/cms/cms_srv.hh @@ -25,7 +25,7 @@ #ifndef CMS_SERVER_HH #define CMS_SERVER_HH -#include "cms_user.hh" /* class CMS, CMS_STATUS */ +#include /* class CMS, CMS_STATUS */ #include "cms_cfg.hh" /* CMS_CONFIG_LINELEN */ #include "libnml/buffer/rem_msg.hh" /* struct REMOTE_READ_REQUEST, */ /* struct REMOTE_WRITE_REQUEST, */ diff --git a/src/libnml/cms/cms_up.cc b/src/libnml/cms/cms_up.cc index 767c0de4322..6a3a03c034b 100644 --- a/src/libnml/cms/cms_up.cc +++ b/src/libnml/cms/cms_up.cc @@ -14,7 +14,7 @@ * Last change: ********************************************************************/ -#include "cms.hh" /* class CMS */ +#include /* class CMS */ #include "cms_up.hh" /* class CMS_UPDATER */ #include "libnml/rcs/rcs_print.hh" /* rcs_print_error() */ diff --git a/src/libnml/cms/cms_up.hh b/src/libnml/cms/cms_up.hh index 47757ee7105..789c6a39e55 100644 --- a/src/libnml/cms/cms_up.hh +++ b/src/libnml/cms/cms_up.hh @@ -19,7 +19,7 @@ #ifndef CMS_UP_HH #define CMS_UP_HH -#include "cms.hh" /* enum CMS_STATUS, class CMS */ +#include /* enum CMS_STATUS, class CMS */ enum CMS_UPDATER_MODE { CMS_NO_UPDATE = 0, diff --git a/src/libnml/cms/cms_xup.cc b/src/libnml/cms/cms_xup.cc index 5ea28786dc0..595e0a14d41 100644 --- a/src/libnml/cms/cms_xup.cc +++ b/src/libnml/cms/cms_xup.cc @@ -20,7 +20,7 @@ #include /* malloc(), free() */ #include -#include "cms.hh" /* class CMS */ +#include /* class CMS */ #include "cms_xup.hh" /* class CMS_XDR_UPDATER */ #include "libnml/rcs/rcs_print.hh" /* rcs_print_error() */ diff --git a/src/libnml/cms/cmsdiag.hh b/src/libnml/cms/cmsdiag.hh index 86942589fad..b547cbba559 100644 --- a/src/libnml/cms/cmsdiag.hh +++ b/src/libnml/cms/cmsdiag.hh @@ -15,7 +15,7 @@ #ifndef CMSDIAG_HH #define CMSDIAG_HH -#include "cms.hh" +#include class LinkedList; class CMS_DIAG_STATIC_PROC_INFO { diff --git a/src/libnml/cms/tcp_srv.cc b/src/libnml/cms/tcp_srv.cc index 06059c167ee..d642074d860 100644 --- a/src/libnml/cms/tcp_srv.cc +++ b/src/libnml/cms/tcp_srv.cc @@ -34,8 +34,8 @@ #include // waitpid #include /* inet_ntoa */ -#include "cms.hh" /* class CMS */ -#include "libnml/nml/nml.hh" // class NML +#include /* class CMS */ +#include // class NML #include "tcp_srv.hh" /* class CMS_SERVER_REMOTE_TCP_PORT */ #include "libnml/rcs/rcs_print.hh" /* rcs_print_error() */ #include "libnml/linklist/linklist.hh" /* class LinkedList */ diff --git a/src/libnml/nml/cmd_msg.cc b/src/libnml/nml/cmd_msg.cc index a6d1dc8515c..b9ff18e180f 100644 --- a/src/libnml/nml/cmd_msg.cc +++ b/src/libnml/nml/cmd_msg.cc @@ -13,12 +13,12 @@ ********************************************************************/ #include -#include "nml.hh" -#include "nmlmsg.hh" -#include "libnml/cms/cms.hh" +#include +#include +#include NMLTYPE nmltype; -#include "cmd_msg.hh" +#include #include "libnml/linklist/linklist.hh" RCS_CMD_MSG::RCS_CMD_MSG(NMLTYPE t, int64_t sz):NMLmsg(t, sz) diff --git a/src/libnml/nml/nml.cc b/src/libnml/nml/nml.cc index 100bac6898f..dbfda89e977 100644 --- a/src/libnml/nml/nml.cc +++ b/src/libnml/nml/nml.cc @@ -22,12 +22,12 @@ #include #include // inet_ntoa -#include "nml.hh" // class NML -#include "nmlmsg.hh" // class NMLmsg -#include "libnml/cms/cms.hh" // class CMS +#include // class NML +#include // class NMLmsg +#include // class CMS #include "libnml/os_intf/timer.hh" // esleep() #include "nml_srv.hh" // NML_Default_Super_Server -#include "libnml/cms/cms_cfg.hh" // cms_config(), cms_copy() +#include // cms_config(), cms_copy() #include "libnml/linklist/linklist.hh" // class LinkedList #include "libnml/rcs/rcs_print.hh" // rcs_print_error() #include "libnml/buffer/physmem.hh" diff --git a/src/libnml/nml/nml_oi.cc b/src/libnml/nml/nml_oi.cc index 2744550f8c1..394aae339b8 100644 --- a/src/libnml/nml/nml_oi.cc +++ b/src/libnml/nml/nml_oi.cc @@ -13,7 +13,8 @@ * Last change: ********************************************************************/ -#include "nml_oi.hh" +#include +#include void NML_ERROR::update(CMS * cms) diff --git a/src/libnml/nml/nml_srv.cc b/src/libnml/nml/nml_srv.cc index 5c81e5e8747..cee7b2fd2f2 100644 --- a/src/libnml/nml/nml_srv.cc +++ b/src/libnml/nml/nml_srv.cc @@ -20,9 +20,9 @@ #include // waitpid() #include // atexit() -#include "nml.hh" -#include "nmlmsg.hh" -#include "libnml/cms/cms.hh" +#include +#include +#include #include "nml_srv.hh" #include "libnml/buffer/rem_msg.hh" // struct REMOTE_READ_REQUEST #include "libnml/rcs/rcs_print.hh" // rcs_print_error() @@ -31,7 +31,7 @@ #include "libnml/linklist/linklist.hh" #include "libnml/buffer/physmem.hh" #include "libnml/cms/cmsdiag.hh" -#include "cmd_msg.hh" // layering violation ahoy +#include // layering violation ahoy NML_SERVER::NML_SERVER(NML * _nml, int _set_to_master):CMS_SERVER() { NML_SERVER_LOCAL_PORT *new_local_port = NULL; diff --git a/src/libnml/nml/nml_srv.hh b/src/libnml/nml/nml_srv.hh index fa977a7b6c6..955aa32a63e 100644 --- a/src/libnml/nml/nml_srv.hh +++ b/src/libnml/nml/nml_srv.hh @@ -19,7 +19,7 @@ #include /* pid_t */ #include "libnml/cms/cms_srv.hh" /* class CMS_SERVER */ -#include "nml.hh" /* class NML */ +#include /* class NML */ #include "libnml/buffer/rem_msg.hh" /* struct REMOTE_READ_REQUEST, */ class NML_SERVER_LOCAL_PORT:public CMS_SERVER_LOCAL_PORT { protected: diff --git a/src/libnml/nml/nmlmsg.cc b/src/libnml/nml/nmlmsg.cc index 50988934aae..feb57e2a16d 100644 --- a/src/libnml/nml/nmlmsg.cc +++ b/src/libnml/nml/nmlmsg.cc @@ -14,8 +14,8 @@ #include // memset -#include "libnml/cms/cms.hh" -#include "nmlmsg.hh" +#include +#include #include "libnml/rcs/rcs_print.hh" /* rcs_error_print() */ /* NMLmsg Functions. */ int NMLmsg::automatically_clear = 1; diff --git a/src/libnml/nml/stat_msg.cc b/src/libnml/nml/stat_msg.cc index b09e12cf776..2fe83a9b296 100644 --- a/src/libnml/nml/stat_msg.cc +++ b/src/libnml/nml/stat_msg.cc @@ -12,12 +12,12 @@ * Last change: ********************************************************************/ -#include "nml.hh" -#include "nmlmsg.hh" -#include "libnml/cms/cms.hh" +#include +#include +#include #include "libnml/linklist/linklist.hh" -#include "stat_msg.hh" +#include #include // memset()