2 files changed, 8 insertions, 13 deletions
diff --git a/src/live_effects/parameter/filletchamferpointarray.cpp b/src/live_effects/parameter/filletchamferpointarray.cpp
index 94a26dd8d..457b68dd2 100644
--- a/src/live_effects/parameter/filletchamferpointarray.cpp
+++ b/src/live_effects/parameter/filletchamferpointarray.cpp
@@ -8,6 +8,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <2geom/piecewise.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/sbasis-geometric.h>
+
 #include "ui/dialog/lpe-fillet-chamfer-properties.h"
 #include "live_effects/parameter/filletchamferpointarray.h"
 #include "live_effects/effect.h"
@@ -15,9 +19,6 @@
 #include "svg/stringstream.h"
 #include "knotholder.h"
 #include "sp-lpe-item.h"
-#include <2geom/piecewise.h>
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/sbasis-geometric.h>
 #include "selection.h"
 
 // needed for on-canvas editting:
@@ -25,8 +26,10 @@
 #include "live_effects/lpeobject.h"
 #include "helper/geom-nodetype.h"
 #include "helper/geom-curves.h"
-#include <cmath>
 #include "ui/tools/node-tool.h"
+
+// TODO due to internal breakage in glibmm headers,
+// this has to be included last.
 #include <glibmm/i18n.h>
 
 using namespace Geom;
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.h b/src/ui/dialog/lpe-fillet-chamfer-properties.h
index a07b5ab66..d3e859bff 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.h
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.h
@@ -9,15 +9,7 @@
 #define INKSCAPE_DIALOG_FILLET_CHAMFER_PROPERTIES_H
 
 #include <2geom/point.h>
-#include <gtkmm/dialog.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/label.h>
-#include <gtkmm/table.h>
-#include <gtkmm/combobox.h>
-#include <gtkmm/liststore.h>
-#include <gtkmm/treeview.h>
-#include <gtkmm/treestore.h>
-#include <gtkmm/scrolledwindow.h>
+#include <gtkmm.h>
 #include "live_effects/parameter/filletchamferpointarray.h"
 
 class SPDesktop;