remove many needless references to n-art-bpath.h

diff --git a/src/display/nr-arena-glyphs.cpp b/src/display/nr-arena-glyphs.cpp
index 9295beccdf63ae539666dd91a278f7cade6ddaf3..0fbc068a12a1196eed534ff4dec045fc62a02187 100644 (file)
--- a/src/display/nr-arena-glyphs.cpp
+++ b/src/display/nr-arena-glyphs.cpp
@@ -17,8 +17,6 @@
 # include <config.h>
 #endif
 #include <libnr/nr-blit.h>
-#include <libnr/nr-path.h>
-#include <libnr/n-art-bpath.h>
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-convert2geom.h>

diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp
index 26b4ea67e5a693a4fa76fc41e6305f16044881dd..b8723e6350af573cc9efdb0ce9787eb8cd13fd3f 100644 (file)
--- a/src/display/nr-arena-shape.cpp
+++ b/src/display/nr-arena-shape.cpp
@@ -18,8 +18,6 @@
 #include <display/nr-arena.h>
 #include <display/nr-arena-shape.h>
 #include "display/curve.h"
-#include <libnr/n-art-bpath.h>
-#include <libnr/nr-path.h>
 #include <libnr/nr-pixops.h>
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-fns.h>

diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index e70b1becaf82e98d0dc8c66bd83c66806f1cf2f1..2cf363358105d5bf2b789538dad5ff4fb1511eeb 100644 (file)
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -12,7 +12,6 @@
  * Read the file 'COPYING' for more information.
  */
 
-#include <libnr/n-art-bpath-2geom.h>
 #include <2geom/pathvector.h>
 #include <2geom/transforms.h>
 #include "../style.h"

diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index c7676be9ef08cdf9ed150919f14bde7ac03a3dfc..a127df87752c1f26bfb92d745f72634426162db5 100644 (file)
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
@@ -24,7 +24,6 @@
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include <glibmm/i18n.h>
-#include "libnr/n-art-bpath.h"
 #include "display/curve.h"
 #include "desktop.h"
 #include "desktop-affine.h"

diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index 0be132340f9bfcf6c50f7edf0ee50f3298b4950d..5c9e45521600c12ac0581e454287b39698b3a44b 100644 (file)
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -22,7 +22,6 @@
 #include <gtkmm/clipboard.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "libnr/n-art-bpath.h"
 #include "macros.h"
 #include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
@@ -44,17 +43,6 @@
 #include "message-context.h"
 #include "libnr/nr-scale-translate-ops.h"
 
-#define C1 0.552
-static NArtBpath const spdc_circle[] = {
-    { NR_MOVETO, 0, 0, 0, 0, -1, 0 },
-    { NR_CURVETO, -1, C1, -C1, 1, 0, 1 },
-    { NR_CURVETO, C1, 1, 1, C1, 1, 0 },
-    { NR_CURVETO, 1, -C1, C1, -1, 0, -1 },
-    { NR_CURVETO, -C1, -1, -1, -C1, -1, 0 },
-    { NR_END, 0, 0, 0, 0, 0, 0 }
-};
-#undef C1
-
 static void sp_dropper_context_class_init(SPDropperContextClass *klass);
 static void sp_dropper_context_init(SPDropperContext *dc);
 

diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 75250c6048e8c4abfedaf69f4013c9388068705a..35e220a4965b5afbf1e795b3469c52f5b0e66b1e 100644 (file)
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -48,8 +48,6 @@
 #include "message-context.h"
 #include "prefs-utils.h"
 #include "pixmaps/cursor-calligraphy.xpm"
-#include "libnr/n-art-bpath.h"
-#include "libnr/nr-path.h"
 #include "libnr/nr-matrix-ops.h"
 #include "libnr/nr-scale-translate-ops.h"
 #include "libnr/nr-convert2geom.h"

diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index c9da645f0488778cdb8f35905122ae1bd7b7e894..e5615897070e5feee2e6a0ed5337162964ab3e9d 100644 (file)
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -28,8 +28,6 @@
 #include "display/nr-arena.h"
 #include "display/nr-arena-item.h"
 
-#include <libnr/n-art-bpath.h>
-
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "sp-item.h"

diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 610f4fb7028ce388a2f5575e8a2f792f784f7d78..735c3cf7a87b7ad31e98dedd6cbc7e96dcd4d31e 100644 (file)
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -29,8 +29,6 @@
 #include "display/nr-arena.h"
 #include "display/nr-arena-item.h"
 
-#include <libnr/n-art-bpath.h>
-
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "sp-item.h"

diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 919bcd12ab2743cf895c061430b1d6b9c07c4b0c..6c727a479bfed238307c04d04ba0760fd809b69c 100644 (file)
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -28,8 +28,6 @@
 #include "display/nr-arena.h"
 #include "display/nr-arena-item.h"
 
-#include <libnr/n-art-bpath.h>
-
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "sp-item.h"

diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 322efffbdbcf138cfc98eb63e23649aa420b97df..e7620f3195c17bd1fc6a1dfef61c23c9a07df2cc 100644 (file)
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -28,7 +28,6 @@
 #include <signal.h>
 #include <errno.h>
 
-#include <libnr/n-art-bpath.h>
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-matrix-translate-ops.h>

diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp
index acae6d3331c3ec60e967cc4eb0b8976c9227fecd..977b0eb64fb7f0a78266035a3a5ea721dc436b13 100644 (file)
--- a/src/extension/internal/emf-win32-inout.cpp
+++ b/src/extension/internal/emf-win32-inout.cpp
@@ -35,7 +35,6 @@
 #include "style.h"
 #include "color.h"
 #include "display/curve.h"
-#include "libnr/n-art-bpath.h"
 #include "libnr/nr-point-matrix-ops.h"
 #include "gtk/gtk.h"
 #include "print.h"

diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index d25ec096cc98b2c47340d7edc14958f26852303c..2e0f2d59fa528d4556615528a182c1e9b38ad7b4 100644 (file)
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -24,7 +24,6 @@
 #include <sp-radial-gradient.h>\r
 #include <style.h>\r
 #include <display/curve.h>\r
-#include <libnr/n-art-bpath.h>\r
 #include <extension/system.h>\r
 #include <2geom/pathvector.h>\r
 #include <2geom/rect.h>\r

diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index bb12e0564cb6641ad21506cc0a2bec60181185d2..01b8e64b5b3c91732fc4027c83c2fb853b20bbd7 100644 (file)
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -26,7 +26,6 @@
 #include <sp-path.h>
 #include <style.h>
 #include <display/curve.h>
-#include <libnr/n-art-bpath.h>
 #include <extension/system.h>
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>

diff --git a/src/extension/internal/ps.cpp b/src/extension/internal/ps.cpp
index 7ee28f87a5ef4877eae4e29c9f9312662015d242..cad5769758aa45cec80861276b07c070bcfebb6d 100644 (file)
--- a/src/extension/internal/ps.cpp
+++ b/src/extension/internal/ps.cpp
@@ -31,9 +31,7 @@
 #include <signal.h>
 #include <errno.h>
 
-#include <libnr/n-art-bpath.h>
 #include <libnr/nr-matrix-fns.h>
-#include <libnr/n-art-bpath-2geom.h>
 
 #include <glib/gmem.h>
 #include <glib/gstrfuncs.h>

diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 3c72826292eaa754f771f89814ac3b2a2998542f..b11d32f8a1d9b0ab2e89ddac684fb397be782443 100644 (file)
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -63,7 +63,6 @@
 #include "splivarot.h"
 #include "livarot/Path.h"
 #include "livarot/Shape.h"
-#include "libnr/n-art-bpath.h"
 #include "svg/svg.h"
 #include "color.h"
 

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 555b9d32dc9421bc322217acf2a1cfe3759ab7ae..64653863b927a402cf8349c70c12323d40d777e0 100644 (file)
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -27,7 +27,6 @@
 #include "live_effects/lpeobject.h"
 #include "live_effects/parameter/parameter.h"
 #include <glibmm/ustring.h>
-#include "libnr/n-art-bpath-2geom.h"
 #include "display/curve.h"
 #include <gtkmm.h>
 

diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index 1235087513598cd49b586fdd8c414920c5328e68..51ca6a558422bcb6727417804022efafbcf39a3d 100644 (file)
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -29,7 +29,6 @@ struct SPDocument;
 struct SPDesktop;
 struct SPItem;
 class SPNodeContext;
-class NArtBpath;
 struct LivePathEffectObject;
 
 namespace Gtk {

diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index e2672670da3619e32462f33089a5ae9a33cb8488..47d029d602cbe029336e7864b2c6747666c46594 100644 (file)
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -12,8 +12,6 @@
 #include "sp-item.h"
 #include "sp-path.h"
 #include "sp-item-group.h"
-//#include <libnr/n-art-bpath.h>
-#include "libnr/n-art-bpath-2geom.h"
 #include "svg/svg.h"
 #include "ui/widget/scalar.h"
 

diff --git a/src/live_effects/lpe-circle_with_radius.cpp b/src/live_effects/lpe-circle_with_radius.cpp
index c5dfebfad80e84bafe2df4fb3e8e5be5c1766485..8b169af3c496360f6ef678b3090d4dfb23d0c561 100644 (file)
--- a/src/live_effects/lpe-circle_with_radius.cpp
+++ b/src/live_effects/lpe-circle_with_radius.cpp
@@ -21,7 +21,6 @@
 
 #include "live_effects/lpe-circle_with_radius.h"
 #include "display/curve.h"
-#include <libnr/n-art-bpath.h>
 
 // You might need to include other 2geom files. You can add them here:
 #include <2geom/path.h>

diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp
index ef3d4cc82143ddb81e86c772ec0770436c02ba99..fad912df741433e7e449a03cf81db293fc5881e1 100755 (executable)
--- a/src/live_effects/lpe-envelope.cpp
+++ b/src/live_effects/lpe-envelope.cpp
@@ -12,9 +12,6 @@
 #include "sp-path.h"
 #include "sp-item-group.h"
 #include "display/curve.h"
-#include <libnr/n-art-bpath.h>
-#include <libnr/nr-matrix-fns.h>
-#include "libnr/n-art-bpath-2geom.h"
 #include "svg/svg.h"
 #include "ui/widget/scalar.h"
 

diff --git a/src/live_effects/lpe-lattice.cpp b/src/live_effects/lpe-lattice.cpp
index 74f032fd4e4c2e1e23e869351924a769592c5e4a..f77434f92dad7c2bcb6da0f494909f8b0d3ebd99 100644 (file)
--- a/src/live_effects/lpe-lattice.cpp
+++ b/src/live_effects/lpe-lattice.cpp
@@ -21,7 +21,6 @@
 #include "sp-item.h"
 #include "sp-path.h"
 #include "display/curve.h"
-#include "libnr/n-art-bpath-2geom.h"
 #include "svg/svg.h"
 #include "nodepath.h"
 

diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index 30ec589afc2162bd5625efd3f424028d46262b2d..2240a0c3db206d0623ca65689ca55fdf6fb6b73e 100644 (file)
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -10,8 +10,6 @@
 #include "live_effects/lpeobject.h"
 #include "sp-shape.h"
 #include "display/curve.h"
-#include <libnr/n-art-bpath.h>
-#include "libnr/n-art-bpath-2geom.h"
 #include "svg/svg.h"
 #include "ui/widget/scalar.h"
 

diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp
index 35c6f0933a9b358f586c20220109b6b6aa9d93a7..d60f9acb1499837b52e8a497fdba9123a101127b 100644 (file)
--- a/src/live_effects/lpe-perp_bisector.cpp
+++ b/src/live_effects/lpe-perp_bisector.cpp
@@ -15,7 +15,6 @@
 
 #include "live_effects/lpe-perp_bisector.h"
 #include "display/curve.h"
-#include <libnr/n-art-bpath.h>
 #include "sp-path.h"
 #include "line-geometry.h"
 #include "sp-lpe-item.h"

diff --git a/src/live_effects/lpe-sketch.h b/src/live_effects/lpe-sketch.h
index 051240665f7fef731bacfa0d3759d618b28c060e..f4881ac55d03147f13a8885913dccd7b0892720d 100644 (file)
--- a/src/live_effects/lpe-sketch.h
+++ b/src/live_effects/lpe-sketch.h
@@ -29,7 +29,6 @@ public:
 
 //  Choose to implement one of the doEffect functions. You can delete or comment out the others.
 //    virtual void doEffect (SPCurve * curve);
-//    virtual NArtBpath * doEffect_nartbpath (NArtBpath * path_in);
 //    virtual std::vector<Geom::Path> doEffect_path (std::vector<Geom::Path> & path_in);
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
 

diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp
index ede13e2d45cb30203e22cef7ec1df42443b37576..b43fd8b36788a43210b65e13692a0d0392657628 100644 (file)
--- a/src/live_effects/lpe-tangent_to_curve.cpp
+++ b/src/live_effects/lpe-tangent_to_curve.cpp
@@ -19,7 +19,6 @@
 //        There must be a more convenient way to achieve this.
 #include "sp-path.h"
 #include "display/curve.h"
-#include "libnr/n-art-bpath-2geom.h"
 
 #include <2geom/path.h>
 #include <2geom/transforms.h>

diff --git a/src/live_effects/lpe-test-doEffect-stack.cpp b/src/live_effects/lpe-test-doEffect-stack.cpp
index 3b578b2c6c4096c8aca20f16e69cb9232929c087..f858e0f4bb691490ee424fdb68ad0e45b372801b 100644 (file)
--- a/src/live_effects/lpe-test-doEffect-stack.cpp
+++ b/src/live_effects/lpe-test-doEffect-stack.cpp
@@ -10,7 +10,6 @@
 
 #include <2geom/piecewise.h>
 #include <vector>
-#include <libnr/n-art-bpath.h>
 #include <cstring>
 using std::memcpy;
 

diff --git a/src/live_effects/lpe-vonkoch.h b/src/live_effects/lpe-vonkoch.h
index c4126e5e66b5dde0b0dab6ffceda11c13b25d134..6ae22bf06f3d45df8ccb2e7bc2614d17ee16bb48 100644 (file)
--- a/src/live_effects/lpe-vonkoch.h
+++ b/src/live_effects/lpe-vonkoch.h
@@ -15,8 +15,6 @@
 #include "live_effects/parameter/enum.h"
 #include "live_effects/parameter/bool.h"
 
-#include "libnr/n-art-bpath-2geom.h"
-
 // needed for on-canvas editting:
 #include "tools-switch.h"
 #include "shape-editor.h"

diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp
index c0f1222f268f97a4c58af5fc9e2e6f039310229f..bd4b5d093d84dd88b65ea0b1215303b29372ab99 100644 (file)
--- a/src/live_effects/lpegroupbbox.cpp
+++ b/src/live_effects/lpegroupbbox.cpp
@@ -9,8 +9,6 @@
 #include "live_effects/lpegroupbbox.h"
 
 #include "sp-item.h"
-#include "libnr/nr-matrix-fns.h"
-#include "libnr/n-art-bpath-2geom.h"
 
 namespace Inkscape {
 namespace LivePathEffect {

diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index e74729b3599e899b9ffafae5e297aec0c8f89490..df329a10c5c6df38c7e36766bd51d4495798e779 100644 (file)
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -8,7 +8,6 @@
 
 #include "live_effects/parameter/path.h"
 #include "live_effects/effect.h"
-#include "libnr/n-art-bpath-2geom.h"
 #include "svg/svg.h"
 #include <2geom/svg-path-parser.h>
 #include <2geom/sbasis-to-bezier.h>

diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index 58dbc3cc370bb284898f5974fb9d8beb830755fc..1c9b30dc3b1877b10c88166cf9aa394b9356c38b 100644 (file)
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -37,7 +37,6 @@
 #include "display/sp-ctrlline.h"
 #include "display/sodipodi-ctrl.h"
 #include <glibmm/i18n.h>
-#include "libnr/n-art-bpath.h"
 #include "libnr/nr-point-ops.h"
 #include "helper/units.h"
 #include "macros.h"

diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp
index 397a5a0ffb0d7cb52f3f6c51b58424c782c5d762..0a5bc74443e6a46ea533f7022589ff087b745248 100644 (file)
--- a/src/pencil-context.cpp
+++ b/src/pencil-context.cpp
@@ -34,7 +34,6 @@
 #include "display/canvas-bpath.h"
 #include <glibmm/i18n.h>
 #include "libnr/in-svg-plane.h"
-#include "libnr/n-art-bpath.h"
 #include "context-fns.h"
 #include "sp-namedview.h"
 #include "xml/repr.h"

diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp
index 8f4dead0ad84d715fdcd2aab986e86b4d6c0b826..2f8dc7c50413af972a2e6de3d6538273d34950b1 100644 (file)
--- a/src/sp-offset.cpp
+++ b/src/sp-offset.cpp
@@ -37,7 +37,6 @@
 #include "sp-use-reference.h"
 #include "uri.h"
 
-#include "libnr/n-art-bpath.h"
 #include <libnr/nr-matrix-fns.h>
 #include <2geom/pathvector.h>
 

diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index 654edcc610a88410c741fc2bb38bdab60f96e973..e641632d910751e93e8b21f0edc79dc70a2873d4 100644 (file)
--- a/src/sp-path.cpp
+++ b/src/sp-path.cpp
@@ -21,8 +21,6 @@
 #include <glibmm/i18n.h>
 
 #include <display/curve.h>
-#include <libnr/n-art-bpath.h>
-#include <libnr/nr-path.h>
 #include <libnr/nr-matrix-fns.h>
 #include <2geom/pathvector.h>
 #include <2geom/bezier-curve.h>

diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 9185ec84b8c376a3f3f6eb33e0baf6fd3cbb9af4..6d592f662ff50d9b795ab5d57643c6878514f93f 100644 (file)
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -1741,11 +1741,8 @@ Path *
 Path_for_item(SPItem *item, bool doTransformation, bool transformFull)
 {
     SPCurve *curve = curve_for_item(item);
-    NArtBpath *bpath = bpath_for_curve(item, curve, doTransformation, transformFull, NR::identity(), NR::identity());
-    
-    if (bpath == NULL) {
+    if (curve == NULL)
         return NULL;
-    }
 
     Geom::PathVector pathv = pathvector_for_curve(item, curve, doTransformation, transformFull);
 

diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index 717d6bdc63896f4d7fd41a13518b69aa1bcc97e7..70cd49c81e1ebf6f96e2da8c19ce598f7518c6b8 100644 (file)
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
@@ -40,8 +40,6 @@
 #include "pixmaps/cursor-push.xpm"
 #include "pixmaps/cursor-roughen.xpm"
 #include "pixmaps/cursor-color.xpm"
-#include "libnr/n-art-bpath.h"
-#include "libnr/nr-path.h"
 #include "libnr/nr-maybe.h"
 #include "libnr/nr-matrix-ops.h"
 #include "libnr/nr-scale-translate-ops.h"

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 7d771c0d4695e1f20062fde860ce6ba8c87543e4..1b9968f8927ccdb037b84007c9c55578eb99da59 100644 (file)
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -70,7 +70,6 @@
 #include "text-context.h"
 #include "text-editing.h"
 #include "tools-switch.h"
-#include "libnr/n-art-bpath-2geom.h"
 #include "path-chemistry.h"
 #include "id-clash.h"
 #include "unit-constants.h"