Removed superfluous ifdef guards.

abb/wbl/mcomp/src/pwr_abbclasses.h_template

-#ifndef pwr_basecomponentclasses_h
 #include "pwr_basecomponentclasses.h"
-#endif
-
-#ifndef pwr_otherioclasses_h
 #include "pwr_otherioclasses.h"
-#endif
-
-#ifndef pwr_profibusoclasses_h
 #include "pwr_profibusclasses.h"
-#endif

abb/wbl/mcomp/src/pwr_abbclasses.hpp_template

-#ifndef pwr_basecomponentclasses_hpp
 #include "pwr_basecomponentclasses.hpp"
-#endif
-
-#ifndef pwr_otherioclasses_hpp
 #include "pwr_otherioclasses.hpp"
-#endif
-
-#ifndef pwr_profibusclasses_hpp
 #include "pwr_profibusclasses.hpp"
-#endif

profibus/lib/cow/gtk/cow_pb_gsd_attrnav_gtk.h

@@ -39,9 +39,7 @@
 
 /* cow_pb_gsd_attrnav_gtk.h -- Profibus gsd configurator navigator */
 
-#ifndef cow_pb_gsd_attrnav_h
 #include "cow_pb_gsd_attrnav.h"
-#endif
 
 //! The navigation area of the attribute editor.
 class GsdAttrNavGtk : public GsdAttrNav {

profibus/lib/cow/gtk/cow_pn_gsdml_attrnav_gtk.h

@@ -39,9 +39,7 @@
 
 /* cow_pn_gsdml_attrnav_gtk.h -- Profibus gsd configurator navigator */
 
-#ifndef cow_pn_gsdml_attrnav_h
 #include "cow_pn_gsdml_attrnav.h"
-#endif
 
 //! The navigation area of the attribute editor.
 class GsdmlAttrNavGtk : public GsdmlAttrNav {

profibus/lib/cow/src/cow_pb_gsd.h

@@ -39,9 +39,7 @@
 
 #include <stdio.h>
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
 typedef enum { gsd_DpSlave, gsd_DpMaster } gsd_eDpType;
 

profibus/lib/rt/src/os_linux/rt_pn_iface.h

@@ -39,17 +39,11 @@
 #ifndef rt_pn_iface_h
 #define rt_pn_iface_h
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
-#ifndef rt_pn_gsdml_data_h
 #include "rt_pn_gsdml_data.h"
-#endif
 
-#ifndef rt_io_pn_locals_h
 #include "rt_io_pn_locals.h"
-#endif
 
 #define PN_MAX_MANU_SPEC_DIAGS 200
 

profibus/wbl/mcomp/src/pwr_profibusclasses.h_template

-#ifndef pwr_baseclasses_h
 #include "pwr_baseclasses.h"
-#endif

profibus/wbl/mcomp/src/pwr_profibusclasses.hpp_template

-#ifndef pwr_baseclasses_hpp
 #include "pwr_baseclasses.hpp"
-#endif

remote/lib/remote/src/remote_ndc.h

@@ -38,9 +38,7 @@
 #define remote_ndc_h
 /* remote_ndc.h -- Network data conversion. */
 
-#ifndef rt_ndc_h
 #include "rt_ndc.h"
-#endif
 
 pwr_tBoolean rndc_ConvertData(pwr_tStatus* sts, const gdb_sNode* np,
     gdb_sClass* cp, void* tp, /* Address of target.  */

sev/exe/sev_xtt/gtk/xtt_tblnav_gtk.h

@@ -41,9 +41,7 @@
 
 #include <gtk/gtk.h>
 
-#ifndef xtt_tblnav_h
 #include "../src/xtt_tblnav.h"
-#endif
 
 //! The navigation area of the attribute editor.
 class TblNavGtk : public TblNav {

sev/exe/sev_xtt/src/xtt_tbl.h

@@ -37,13 +37,12 @@
 #ifndef xtt_tbl_h
 #define xtt_tbl_h
 
-#ifndef pwr_privilege_h
 #include "pwr_privilege.h"
-#endif
 
-#include "glow.h"
 #include "rt_sevcli.h"
 
+#include "glow.h"
+
 /* xtt_tbl.h -- Sev Table Viewer */
 
 class TblNav;

siemens/wbl/mcomp/src/pwr_siemensclasses.h_template

-#ifndef pwr_basecomponentclasses_h
 #include "pwr_basecomponentclasses.h"
-#endif
-
-#ifndef pwr_profibusclasses_h
 #include "pwr_profibusclasses.h"
-#endif

siemens/wbl/mcomp/src/pwr_siemensclasses.hpp_template

-#ifndef pwr_basecomponentclasses_hpp
 #include "pwr_basecomponentclasses.hpp"
-#endif
-
-#ifndef pwr_profibusclasses_hpp
 #include "pwr_profibusclasses.hpp"
-#endif

src/exe/rt_sim/src/rt_sim.h

@@ -37,9 +37,7 @@
 #ifndef rt_sim_h
 #define rt_sim_h
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 #include "pwr_baseclasses.h"
 
 /*! \file rt_sim.h

src/exp/inc/src/pwr_class.h

@@ -40,9 +40,7 @@
 /* pwr_class.h -- system classes
 */
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {

src/exp/inc/src/pwr_version.h

@@ -44,9 +44,7 @@
     Defines version varibles to use in messages to user.
 */
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
 #if defined OS_LYNX
 #define pwrv_cOpSys "LynxOS"

src/lib/co/src/co_errno.h

@@ -43,15 +43,10 @@ extern "C" {
 
 /* co_errno.h -- Translate UNIX errno error codes. */
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
-#ifndef pwr_msg_h
 #include "pwr_msg.h"
-#endif
-#ifndef co_errno_msg_h
+
 #include "co_errno_msg.h"
-#endif
 
 #define ERRNO_BADBIT 16384
 #define EBADCODE 65534

src/lib/co/src/co_math.h

@@ -64,10 +64,12 @@
 #define ABS(Dragon) ((Dragon) >= 0 ? (Dragon) : (-(Dragon)))
 #endif
 
+#ifndef CLAMP
 /*! \def CLAMP(x, min, max) 
     \brief Restricts \a x to be between \a min and \a max
  */
 #define CLAMP(x, min, max) ((x) < (min)) ? (min) : (((x) > (max)) ? (max) : (x))
+#endif
 
 /*! \def SIGN(x) 
     \brief Returns the sign of \a x,

src/lib/co/src/co_msg.h

@@ -37,9 +37,7 @@
 #ifndef co_msg_h
 #define co_msg_h
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
 #if defined __cplusplus
 extern "C" {

src/lib/co/src/co_platform.h

@@ -45,9 +45,7 @@
 extern "C" {
 #endif
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
 #define LASTUNSIGNED ((u_int)0 - 1)
 

src/lib/co/src/co_time.h

@@ -37,9 +37,7 @@
 #ifndef co_time_h
 #define co_time_h
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {

src/lib/co/src/co_tree.h

@@ -41,15 +41,11 @@
 extern "C" {
 #endif
 
-#ifndef __STDDEF_LOADED
 #include <stddef.h>
-#endif
 
 #include "pwr.h"
 
-#ifndef co_tree_msg_h
 #include "co_tree_msg.h"
-#endif
 
 typedef struct tree_s_Table tree_sTable;
 typedef struct tree_s_Alloc tree_sAlloc;

src/lib/rt/src/rt_csup.h

@@ -39,9 +39,7 @@
 
 /* rt_csup.h -- Cycle supervision */
 
-#ifndef rt_lst_h
 #include "rt_lst.h"
-#endif
 
 typedef struct {
   lst_sEntry le;

src/lib/rt/src/rt_cvolc.h

@@ -39,9 +39,7 @@
 
 /* rt_cvolc.h -- Cached volumes, client calls.  */
 
-#ifndef rt_cvol_h
 #include "rt_cvol.h"
-#endif
 
 /* Callable functions.  */
 

src/lib/rt/src/rt_errl.h

@@ -37,9 +37,7 @@
 #ifndef rt_errl_h
 #define rt_errl_h
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
 #if defined OS_LYNX
 #define LOG_QUEUE_NAME "/pwrlogqueue"

src/lib/rt/src/rt_io_base.h

@@ -45,13 +45,8 @@ extern "C" {
 
 typedef struct io_sCtx* io_tCtx;
 
-#ifndef rt_io_supervise_h
-#include "rt_io_supervise.h"
-#endif
-
-#ifndef rt_io_methods_h
 #include "rt_io_methods.h"
-#endif
+#include "rt_io_supervise.h"
 
 #ifndef NULL
 #define NULL (void*)0

src/lib/rt/src/rt_io_bus.h

@@ -43,9 +43,7 @@
 extern "C" {
 #endif
 
-#ifndef rt_io_supervise_h
 #include "rt_io_supervise.h"
-#endif
 
 #ifndef NULL
 #define NULL (void*)0

src/lib/rt/src/rt_io_methods.h

@@ -39,9 +39,7 @@
 
 /* rt_io_methods.h -- includefile for io methods. */
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
 typedef struct {
   pwr_tObjName MethodName;

src/lib/rt/src/rt_io_tabai.h

@@ -37,9 +37,7 @@
 #ifndef rt_io_tabai_h
 #define rt_io_tabai_h
 
-#ifndef rt_io_filter_ai_h
 #include "rt_io_filter_ai.h"
-#endif
 
 pwr_sClass_ai_value_base* io_IniAIvalP; /* Pointer to AI-value 	*/
 pwr_sClass_Ai_7436* io_IniAIcon[64]; /* Pointer to Card obj  */

src/lib/rt/src/rt_io_tabdi.h

@@ -37,9 +37,7 @@
 #ifndef rt_io_tabdi_h
 #define rt_io_tabdi_h
 
-#ifndef rt_io_filter_di_h
 #include "rt_io_filter_di.h"
-#endif
 
 pwr_sClass_di_value_base* io_IniDIvalueP; /* Pointer DI-value	*/
 pwr_tInt32 io_IniDIcsr[128]; /* Device adress	*/

src/lib/rt/src/rt_io_tabdo.h

@@ -37,9 +37,7 @@
 #ifndef rt_io_tabdo_h
 #define rt_io_tabdo_h
 
-#ifndef rt_io_filter_po_h
 #include "rt_io_filter_po.h"
-#endif
 
 pwr_sClass_do_value_base* io_IniDOvalueP; /* Pointer to DO-value */
 pwr_tUInt16 io_IniDOold[128]; /* Old/saved value bitdata */

src/lib/rt/src/rt_plc_rt.h

@@ -34,13 +34,11 @@
  * General Public License plus this exception.
  */
 
-#ifndef rt_plc_h
-#include "rt_plc.h"
-#endif
+#ifndef rt_plc_rt_h
+#define rt_plc_rt_h
 
-#ifndef rt_plc_proc_h
+#include "rt_plc.h"
 #include "rt_plc_proc.h"
-#endif
 
 /* Direct link table */
 struct plc_rtdbref {
@@ -56,3 +54,5 @@ struct plc_rtdbref {
 #define UC_WRITE 2
 #define UC_READ2 3
 #define UC_WRITE2 4
+
+#endif
\ No newline at end of file

src/lib/rt/src/rt_plc_timer.h

@@ -95,9 +95,7 @@ extern pthread_mutex_t timer_mutex;
     }                                                                          \
   }
 
-#ifndef rt_plc_h
 #include "rt_plc.h"
-#endif
 
 void plc_inittimer(plc_sThread* tp);
 void plc_timerhandler(plc_sThread* tp);

src/lib/rt/src/rt_rtt.h

@@ -37,12 +37,8 @@
 #ifndef rt_rtt_h
 #define rt_rtt_h
 
-#ifndef rt_gdh_h
 #include "rt_gdh.h"
-#endif
-#ifndef rt_mh_outunit_h
 #include "rt_mh_outunit.h"
-#endif
 
 #define RTT_CTXTYPE_MENU 0
 #define RTT_CTXTYPE_VIEW 1
@@ -429,8 +425,6 @@ typedef struct {
   char* buffer_ptr;
 } rtt_t_loggtable;
 
-#ifndef rt_rtt_functions_h
 #include "rt_rtt_functions.h"
-#endif
 
 #endif

src/lib/statussrv/src/statussrv_utl.h

@@ -37,9 +37,7 @@
 #ifndef statussrv_utl_h
 #define statussrv_utl_h
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {

ssabox/wbl/mcomp/src/pwr_ssaboxclasses.h_template

-#ifndef pwr_basecomponentclasses_h
 #include "pwr_basecomponentclasses.h"
-#endif
-
-#ifndef pwr_profibusclasses_h
 #include "pwr_profibusclasses.h"
-#endif

ssabox/wbl/mcomp/src/pwr_ssaboxclasses.hpp_template

-#ifndef pwr_basecomponentclasses_hpp
 #include "pwr_basecomponentclasses.hpp"
-#endif
-
-#ifndef pwr_profibusclasses_hpp
 #include "pwr_profibusclasses.hpp"
-#endif

wb/exe/wb/gtk/wb_gtk.h

@@ -39,9 +39,7 @@
 #ifndef wb_gtk_h
 #define wb_gtk_h
 
-#ifndef wb_main_h
 #include "wb_main.h"
-#endif
 
 class WbGtk : public Wb {
  public:

wb/exe/wb/qt/wb_qt.h

@@ -37,9 +37,7 @@
 #ifndef wb_qt_h
 #define wb_qt_h
 
-#ifndef wb_main_h
 #include "wb_main.h"
-#endif
 
 #include <QWidget>
 

wb/exe/wb_cmd/gtk/wb_cmdc_gtk.h

@@ -37,9 +37,7 @@
 #ifndef wb_cmdc_gtk_h
 #define wb_cmdc_gtk_h
 
-#ifndef wb_cmdc_h
-# include "wb_cmdc.h"
-#endif
+#include "wb_cmdc.h"
 
 class CmdGtk : public Cmd {
   public:

wb/exe/wb_cmd/qt/wb_cmdc_qt.h

@@ -37,9 +37,7 @@
 #ifndef wb_cmdc_qt_h
 #define wb_cmdc_qt_h
 
-#ifndef wb_cmdc_h
 #include "wb_cmdc.h"
-#endif
 
 class CmdQt : public Cmd {
   public:

wb/lib/wb/gtk/wb_bckwnav_gtk.h

@@ -39,9 +39,7 @@
 
 /* wb_bckwnav_gtk.h -- Backup display window */
 
-#ifndef wb_bckwnav_h
 #include "wb_bckwnav.h"
-#endif
 
 class WbBckWNavGtk : public WbBckWNav {
 public:

wb/lib/wb/gtk/wb_expwnav_gtk.h

@@ -39,9 +39,7 @@
 
 /* wb_expwnav_gtk.h -- Backup display window */
 
-#ifndef wb_expwnav_h
 #include "wb_expwnav.h"
-#endif
 
 class WbExpWNavGtk : public WbExpWNav {
 public:

wb/lib/wb/gtk/wb_foe_gtk.h

@@ -39,13 +39,9 @@
 
 /* wb_foe_gtk.h -- function block object editor */
 
-#ifndef wb_foe_h
 #include "wb_foe.h"
-#endif
 
-#ifndef cow_wow_gtk_h
 #include "cow_wow_gtk.h"
-#endif
 
 struct s_widgets {
   GtkWidget* label;

wb/lib/wb/gtk/wb_gre_gtk.h

@@ -37,9 +37,7 @@
 #ifndef wb_gre_gtk_h
 #define wb_gre_gtk_h
 
-#ifndef wb_gre_h
 #include "wb_gre.h"
-#endif
 
 class WGreGtk : public WGre {
 public:

wb/lib/wb/gtk/wb_nav_gtk.h

@@ -39,9 +39,7 @@
 
 /* wb_nav_gtk.h -- Simple navigator */
 
-#ifndef wb_nav_h
 #include "wb_nav.h"
-#endif
 
 class NavGtk : public Nav {
 public:

wb/lib/wb/gtk/wb_pal_gtk.h

@@ -37,9 +37,7 @@
 #ifndef wb_pal_gtk_h
 #define wb_pal_gtk_h
 
-#ifndef wb_pal_h
 #include "wb_pal.h"
-#endif
 
 class PalGtk : public Pal {
 public:

wb/lib/wb/gtk/wb_uted_gtk.h

@@ -37,9 +37,7 @@
 #ifndef wb_uted_gtk_h
 #define wb_uted_gtk_h
 
-#ifndef wb_uted_h
 #include "wb_uted.h"
-#endif
 
 struct uted_s_widgets {
   GtkWidget* uted_window;

wb/lib/wb/gtk/wb_vsel_gtk.h

@@ -39,9 +39,7 @@
 
 /* wb_vsel_gtk.h -- select volume */
 
-#ifndef wb_vsel_h
 #include "wb_vsel.h"
-#endif
 
 struct vsel_widgets {
   GtkWidget* toplevel;

wb/lib/wb/gtk/wb_watt_gtk.h

@@ -39,13 +39,9 @@
 
 /* wb_watt_gtk.h -- Object attribute editor */
 
-#ifndef wb_watt_h
 #include "wb_watt.h"
-#endif
 
-#ifndef cow_wow_gtk_h
 #include "cow_wow_gtk.h"
-#endif
 
 class WAttGtk : public WAtt {
 public:

wb/lib/wb/gtk/wb_watttext_gtk.h

@@ -39,13 +39,9 @@
 
 /* wb_watttext_gtk.h -- Object attribute editor */
 
-#ifndef wb_watttext_h
 #include "wb_watttext.h"
-#endif
 
-#ifndef cow_wow_gtk_h
 #include "cow_wow_gtk.h"
-#endif
 
 class WAttTextGtk : public WAttText {
 public:

wb/lib/wb/gtk/wb_wcast_gtk.h

@@ -39,9 +39,7 @@
 
 /* wb_wcast_gtk.h -- Attribute object casting window. */
 
-#ifndef wb_wcast_h
 #include "wb_wcast.h"
-#endif
 
 class WCastGtk : public WCast {
 public:

wb/lib/wb/gtk/wb_wda_gtk.h

@@ -39,13 +39,9 @@
 
 /* wb_wda_gtk.h -- Spreadsheet editor */
 
-#ifndef wb_wda_h
 #include "wb_wda.h"
-#endif
 
-#ifndef cow_wow_gtk_h
 #include "cow_wow_gtk.h"
-#endif
 
 class WdaGtk : public Wda {
 public:

wb/lib/wb/gtk/wb_wdanav_gtk.h

@@ -37,9 +37,7 @@
 #ifndef wb_wattnav_gtk_h
 #define wb_wattnav_gtk_h
 
-#ifndef wb_wdanav_h
 #include "wb_wdanav.h"
-#endif
 
 class WdaNavGtk : public WdaNav {
 public:

wb/lib/wb/gtk/wb_wge_gtk.h

@@ -37,13 +37,9 @@
 #ifndef wb_wge_gtk_h
 #define wb_wge_gtk_h
 
-#ifndef wb_wge_h
 #include "wb_wge.h"
-#endif
 
-#ifndef cow_wow_gtk_h
 #include "cow_wow_gtk.h"
-#endif
 
 class WGeGtk : public WGe {
 public:

wb/lib/wb/gtk/wb_wpkg_gtk.h

@@ -39,13 +39,9 @@
 
 /* wb_wpkg_gtk.h -- Package window */
 
-#ifndef wb_wpkg_h
 #include "wb_wpkg.h"
-#endif
 
-#ifndef cow_wow_gtk_h
 #include "cow_wow_gtk.h"
-#endif
 
 class WPkgGtk : public WPkg {
 public:

wb/lib/wb/gtk/wb_wpkgnav_gtk.h

@@ -37,9 +37,7 @@
 #ifndef wb_wpkgnav_gtk_h
 #define wb_wpkgnav_gtk_h
 
-#ifndef wb_wpkgnav_h
 #include "wb_wpkgnav.h"
-#endif
 
 class WPkgNavGtk : public WPkgNav {
 public:

wb/lib/wb/gtk/wb_wrev_gtk.h

@@ -39,13 +39,9 @@
 
 /* wb_wrev_gtk.h -- Package window */
 
-#ifndef wb_wrev_h
 #include "wb_wrev.h"
-#endif
 
-#ifndef cow_wow_gtk_h
 #include "cow_wow_gtk.h"
-#endif
 
 class WRevGtk : public WRev {
 public:

wb/lib/wb/gtk/wb_wrevnav_gtk.h

@@ -37,9 +37,7 @@
 #ifndef wb_wrevnav_gtk_h
 #define wb_wrevnav_gtk_h
 
-#ifndef wb_wrevnav_h
 #include "wb_wrevnav.h"
-#endif
 
 class WRevNavGtk : public WRevNav {
 public:

wb/lib/wb/qt/wb_bckw_qt.h

@@ -41,9 +41,7 @@
 
 #include "cow_wow_qt.h"
 
-#ifndef wb_bckw_h
 #include "wb_bckw.h"
-#endif
 
 class WbBckWQtWidget;
 

wb/lib/wb/qt/wb_bckwnav_qt.h

@@ -39,9 +39,7 @@
 
 /* wb_bckwnav_qt.h -- Backup display window */
 
-#ifndef wb_bckwnav_h
 #include "wb_bckwnav.h"
-#endif
 
 #include <QWidget>
 

wb/lib/wb/qt/wb_expw_qt.h

@@ -41,9 +41,7 @@
 
 #include "cow_wow_qt.h"
 
-#ifndef wb_expw_h
 #include "wb_expw.h"
-#endif
 
 class WbExpWQtWidget;
 

wb/lib/wb/qt/wb_expwnav_qt.h

@@ -39,9 +39,7 @@
 
 /* wb_expwnav_qt.h -- Backup display window */
 
-#ifndef wb_expwnav_h
 #include "wb_expwnav.h"
-#endif
 
 #include <QWidget>
 

wb/lib/wb/qt/wb_foe_qt.h

@@ -39,9 +39,7 @@
 
 /* wb_foe_qt.h -- function block object editor */
 
-#ifndef wb_foe_h
 #include "wb_foe.h"
-#endif
 
 #include "cow_wow_qt.h"
 

wb/lib/wb/qt/wb_gre_qt.h

@@ -37,9 +37,7 @@
 #ifndef wb_gre_qt_h
 #define wb_gre_qt_h
 
-#ifndef wb_gre_h
 #include "wb_gre.h"
-#endif
 
 #include <QWidget>
 

wb/lib/wb/qt/wb_nav_qt.h

@@ -39,9 +39,7 @@
 
 /* wb_nav_qt.h -- Simple navigator */
 
-#ifndef wb_nav_h
 #include "wb_nav.h"
-#endif
 
 #include <QWidget>
 

wb/lib/wb/qt/wb_pal_qt.h

@@ -37,9 +37,7 @@
 #ifndef wb_pal_qt_h
 #define wb_pal_qt_h
 
-#ifndef wb_pal_h
 #include "wb_pal.h"
-#endif
 
 #include <QWidget>
 

wb/lib/wb/qt/wb_uted_qt.h

@@ -37,9 +37,7 @@
 #ifndef wb_uted_qt_h
 #define wb_uted_qt_h
 
-#ifndef wb_uted_h
 #include "wb_uted.h"
-#endif
 
 #include <QCheckBox>
 #include <QLabel>

wb/lib/wb/qt/wb_utl_qt.h

@@ -37,7 +37,6 @@
 #ifndef wb_utl_qt_h
 #define wb_utl_qt_h
 
-// #include "flow_ctx.h"
 #include "wb_utl.h"
 
 #include <QWidget>

wb/lib/wb/qt/wb_vsel_qt.h

@@ -39,9 +39,7 @@
 
 /* wb_vsel_qt.h -- select volume */
 
-#ifndef wb_vsel_h
 #include "wb_vsel.h"
-#endif
 
 #include <QTreeWidget>
 

wb/lib/wb/qt/wb_watt_qt.h

@@ -41,9 +41,7 @@
 
 #include "cow_wow_qt.h"
 
-#ifndef wb_watt_h
 #include "wb_watt.h"
-#endif
 
 #include <QLabel>
 #include <QSplitter>

wb/lib/wb/qt/wb_wattnav_qt.h

@@ -37,9 +37,7 @@
 #ifndef wb_wattnav_qt_h
 #define wb_wattnav_qt_h
 
-#ifndef wb_wattnav_h
 #include "wb_wattnav.h"
-#endif
 
 #include <QWidget>
 

wb/lib/wb/qt/wb_watttext_qt.h

@@ -39,9 +39,7 @@
 
 /* wb_watttext_qt.h -- Object attribute editor */
 
-#ifndef wb_watttext_h
 #include "wb_watttext.h"
-#endif
 
 #include <QLabel>
 #include <QTextEdit>

wb/lib/wb/qt/wb_wcast_qt.h

@@ -39,9 +39,7 @@
 
 /* wb_wcast_qt.h -- Attribute object casting window. */
 
-#ifndef wb_wcast_h
 #include "wb_wcast.h"
-#endif
 
 #include <QWidget>
 

wb/lib/wb/qt/wb_wda_qt.h

@@ -41,9 +41,7 @@
 
 #include "cow_wow_qt.h"
 
-#ifndef wb_wda_h
 #include "wb_wda.h"
-#endif
 
 #include <QCheckBox>
 #include <QLabel>

wb/lib/wb/qt/wb_wdanav_qt.h

@@ -37,10 +37,7 @@
 #ifndef wb_wattnav_qt_h
 #define wb_wattnav_qt_h
 
-// #include "wb_utility.h"
-#ifndef wb_wdanav_h
 #include "wb_wdanav.h"
-#endif
 
 class WdaNavQt : public WdaNav {
 public:

wb/lib/wb/qt/wb_wge_qt.h

@@ -39,9 +39,7 @@
 
 #include "cow_wow_qt.h"
 
-#ifndef wb_wge_h
 #include "wb_wge.h"
-#endif
 
 #include <QLabel>
 

wb/lib/wb/qt/wb_wpkg_qt.h

@@ -41,9 +41,7 @@
 
 #include "cow_wow_qt.h"
 
-#ifndef wb_wpkg_h
 #include "wb_wpkg.h"
-#endif
 
 #include <QLabel>
 

wb/lib/wb/qt/wb_wpkgnav_qt.h

@@ -37,10 +37,7 @@
 #ifndef wb_wpkgnav_qt_h
 #define wb_wpkgnav_qt_h
 
-// #include "wb_utility.h"
-#ifndef wb_wpkgnav_h
 #include "wb_wpkgnav.h"
-#endif
 
 class WPkgNavQt : public WPkgNav {
 public:

wb/lib/wb/qt/wb_wrev_qt.h

@@ -41,9 +41,7 @@
 
 #include "cow_wow_qt.h"
 
-#ifndef wb_wrev_h
 #include "wb_wrev.h"
-#endif
 
 #include <QLabel>
 

wb/lib/wb/qt/wb_wrevnav_qt.h

@@ -37,9 +37,7 @@
 #ifndef wb_wrevnav_qt_h
 #define wb_wrevnav_qt_h
 
-#ifndef wb_wrevnav_h
 #include "wb_wrevnav.h"
-#endif
 
 class WRevNavQt : public WRevNav {
 public:

wb/lib/wb/qt/wb_wtt_qt.h

@@ -41,9 +41,7 @@
 
 #include "cow_wow_qt.h"
 
-#ifndef wb_wtt_h
 #include "wb_wtt.h"
-#endif
 
 #include <QCheckBox>
 #include <QLabel>

wb/lib/wb/qt/wb_xcrr_qt.h

@@ -41,9 +41,7 @@
 
 #include "cow_wow_qt.h"
 
-#ifndef wb_xcrr_h
 #include "wb_xcrr.h"
-#endif
 
 class WCrrQtWidget;
 

wb/lib/wb/src/wb_bckw.h

@@ -39,12 +39,10 @@
 
 /* wb_bckw.h -- Backupfile display window */
 
-#ifndef wb_bckwnav_h
-#include "wb_bckwnav.h"
-#endif
-
 #include "cow_wow.h"
 
+#include "wb_bckwnav.h"
+
 class WbBckW {
 public:
   WbBckW(void* l_parent_ctx, ldh_tSesContext l_ldhses, const char* bckw_name,

wb/lib/wb/src/wb_bckwnav.h

@@ -39,13 +39,9 @@
 
 /* wb_bckwnav.h -- Backupfile display window */
 
-#ifndef flow_browapi_h
 #include "flow_browapi.h"
-#endif
 
-#ifndef wb_bck_h
 #include "wb_bck.h"
-#endif
 
 typedef enum { bckwitem_eItemType_Bck } bckwitem_eItemType;
 

wb/lib/wb/src/wb_exo.h

@@ -37,9 +37,7 @@
 #ifndef wb_exo_h
 #define wb_exo_h
 
-#ifndef wb_vldh_h
 #include "wb_vldh.h"
-#endif
 
 int exo_wind_exec(vldh_t_wind wind);
 

wb/lib/wb/src/wb_expw.h

@@ -39,12 +39,10 @@
 
 /* wb_expw.h -- Backupfile display window */
 
-#ifndef wb_expwnav_h
-#include "wb_expwnav.h"
-#endif
-
 #include "cow_wow.h"
 
+#include "wb_expwnav.h"
+
 class WbExpW {
 public:
   WbExpW(void* l_parent_ctx, ldh_tSesContext l_ldhses, const char* expw_name,

wb/lib/wb/src/wb_foe.h

@@ -39,21 +39,10 @@
 
 /* wb_foe.h -- function block object editor */
 
-#ifndef wb_utility_h
-#include "wb_utility.h"
-#endif
-
-#ifndef wb_h
 #include "wb.h"
-#endif
-
-#ifndef wb_goen_h
 #include "wb_goen.h"
-#endif
-
-#ifndef wb_tra_h
 #include "wb_tra.h"
-#endif
+#include "wb_utility.h"
 
 #define TRACE 0
 #define SIMULATE 1

wb/lib/wb/src/wb_foe_dataarithm.h

@@ -37,9 +37,7 @@
 #ifndef wb_foe_dataarithm_h
 #define wb_foe_dataarithm_h
 
-#ifndef pwr_h
 #include "pwr.h"
-#endif
 
 pwr_tStatus dataarithm_convert(char* str, char* newstr, char* object,
     int bufsize, char* error_line, int* error_line_size, int* error_line_num,

wb/lib/wb/src/wb_genstruct.h

@@ -41,9 +41,7 @@
    This include file contains definitions and function prototypes
    needed to use ds_ldh_genstruct.  */
 
-#ifndef wb_ldh_h
 #include "wb_ldh.h"
-#endif
 
 int genstr_process_top(ldh_tSesContext sesctx, char* volname);
 int genstr_psts(unsigned long int sts, FILE* logfile);

wb/lib/wb/src/wb_gobj.h

@@ -37,9 +37,7 @@
 #ifndef wb_gobj_h
 #define wb_gobj_h
 
-#ifndef wb_foe_h
 #include "wb_foe.h"
-#endif
 
 int gobj_get_object(WFoe* foe, vldh_t_node node, unsigned long index);
 

wb/lib/wb/src/wb_goec.h

@@ -37,9 +37,7 @@
 #ifndef wb_goec_h
 #define wb_goec_h
 
-#ifndef wb_gre_h
 #include "wb_gre.h"
-#endif
 
 int goec_con_draw(
     WGre* gre, vldh_t_con con_object, int create_flag, vldh_t_node node);

wb/lib/wb/src/wb_ldhdb.h

@@ -37,9 +37,7 @@
 #ifndef wb_ldhdb_h
 #define wb_ldhdb_h
 
-#ifndef wb_ldhi_h
 #include "wb_ldhi.h"
-#endif
 
 pwr_tStatus ldhdb_LoadObjectHeaders(ldhi_sWorkbench* wb);
 

wb/lib/wb/src/wb_ldhld.h

@@ -40,9 +40,7 @@
 /* wb_ldhld.h
    This module contains functions to create load data files.  */
 
-#ifndef wb_ldh_h
 #include "wb_ldh.h"
-#endif
 
 /*============================================================================*\
   Exported functions.

wb/lib/wb/src/wb_lfu.h

@@ -39,13 +39,9 @@
 #ifndef wb_lfu_h
 #define wb_lfu_h
 
-#ifndef wb_ldh_h
-#include "wb_ldh.h"
-#endif
-
-#ifndef cow_wow_h
 #include "cow_wow.h"
-#endif
+
+#include "wb_ldh.h"
 
 #ifdef __cplusplus
 extern "C" {

wb/lib/wb/src/wb_nav.h

@@ -39,9 +39,7 @@
 
 /* wb_nav.h -- Simple navigator */
 
-#ifndef wb_pal_h
 #include "wb_pal.h"
-#endif
 
 class Nav {
 public:

wb/lib/wb/src/wb_tra.h

@@ -37,13 +37,9 @@
 #ifndef wb_tra_h
 #define wb_tra_h
 
-#ifndef rt_gdh_h
 #include "rt_gdh.h"
-#endif
 
-#ifndef wb_gre_h
 #include "wb_gre.h"
-#endif
 
 class WFoe;
 

wb/lib/wb/src/wb_trv.h

@@ -37,9 +37,7 @@
 #ifndef wb_trv_h
 #define wb_trv_h
 
-#ifndef wb_ldh_h
 #include "wb_ldh.h"
-#endif
 
 typedef enum {
   trv_eDepth_Deep,

wb/lib/wb/src/wb_uted.h

@@ -37,9 +37,7 @@
 #ifndef wb_uted_h
 #define wb_uted_h
 
-#ifndef wb_ldh_h
 #include "wb_ldh.h"
-#endif
 
 #define UTED_MODE_EDIT 0
 #define UTED_MODE_VIEW 1

wb/lib/wb/src/wb_utl.h

@@ -37,9 +37,7 @@
 #ifndef wb_utl_h
 #define wb_utl_h
 
-#ifndef wb_foe_h
 #include "wb_foe.h"
-#endif
 
 class wb_utl {
 public: