5 files changed, 6 insertions, 9 deletions
diff --git a/GudhUI/gui/MainWindow.h b/GudhUI/gui/MainWindow.h
index c8c3fcf6..15664dcb 100644
--- a/GudhUI/gui/MainWindow.h
+++ b/GudhUI/gui/MainWindow.h
@@ -23,8 +23,8 @@
 #ifndef GUI_MAINWINDOW_H_
 #define GUI_MAINWINDOW_H_
 
-// Workaround for moc-qt4 not parsing boost headers
-#include <CGAL/config.h>
+// Workaround https://svn.boost.org/trac/boost/ticket/12534
+#include <boost/container/flat_map.hpp>
 
 #include <QMainWindow>
 #include "ui_main_window.h"
diff --git a/GudhUI/gui/Menu_edge_contraction.h b/GudhUI/gui/Menu_edge_contraction.h
index 08f0bf67..2d5640e8 100644
--- a/GudhUI/gui/Menu_edge_contraction.h
+++ b/GudhUI/gui/Menu_edge_contraction.h
@@ -23,11 +23,8 @@
 #ifndef GUI_MENU_EDGE_CONTRACTION_H_
 #define GUI_MENU_EDGE_CONTRACTION_H_
 
-// Workaround for moc-qt4 not parsing boost headers
-#include <CGAL/config.h>
-
 #include "gui/MainWindow.h"
-#include "gui/ui_MenuEdgeContraction.h"
+#include "ui_MenuEdgeContraction.h"
 
 #include "model/Model.h"
 
diff --git a/GudhUI/gui/Menu_k_nearest_neighbors.h b/GudhUI/gui/Menu_k_nearest_neighbors.h
index 8088b768..77303b67 100644
--- a/GudhUI/gui/Menu_k_nearest_neighbors.h
+++ b/GudhUI/gui/Menu_k_nearest_neighbors.h
@@ -24,7 +24,7 @@
 #define GUI_MENU_K_NEAREST_NEIGHBORS_H_
 
 #include <QMainWindow>
-#include "gui/ui_KNearestNeighborsMenu.h"
+#include "ui_KNearestNeighborsMenu.h"
 
 class QWidget;
 
diff --git a/GudhUI/gui/Menu_persistence.h b/GudhUI/gui/Menu_persistence.h
index 8c4df158..1a2a2408 100644
--- a/GudhUI/gui/Menu_persistence.h
+++ b/GudhUI/gui/Menu_persistence.h
@@ -25,7 +25,7 @@
 #define GUI_MENU_PERSISTENCE_H_
 
 #include <QMainWindow>
-#include "gui/ui_PersistenceMenu.h"
+#include "ui_PersistenceMenu.h"
 
 class QWidget;
 
diff --git a/GudhUI/gui/Menu_uniform_neighbors.h b/GudhUI/gui/Menu_uniform_neighbors.h
index 0b6f65fe..61316966 100644
--- a/GudhUI/gui/Menu_uniform_neighbors.h
+++ b/GudhUI/gui/Menu_uniform_neighbors.h
@@ -25,7 +25,7 @@
 #define GUI_MENU_UNIFORM_NEIGHBORS_H_
 
 #include <QMainWindow>
-#include "gui/ui_UniformNeighborsMenu.h"
+#include "ui_UniformNeighborsMenu.h"
 
 class Menu_uniform_neighbors : public QDialog, public Ui::UniformMenu {
   Q_OBJECT