diff --git a/app/Operations/ClassAnalysisOp.cpp b/app/Operations/ClassAnalysisOp.cpp
index f19a6d5f36a63ec667b048f46c9ce2eaeac2a4ae..4a56b3e1c42295229c0bb162cdcec74775eb9467 100644
--- a/app/Operations/ClassAnalysisOp.cpp
+++ b/app/Operations/ClassAnalysisOp.cpp
@@ -49,7 +49,7 @@ void ClassAnalysisOp::operator()(const imagein::Image* img, const std::map<const
 
 
     if(dialog->isLearningStep()) {
-        FILE* f = fopen(dialog->getFileName().toAscii(), "wt" );
+        FILE* f = fopen(dialog->getFileName().toLatin1(), "wt" );
         if(f == NULL) {
             QMessageBox::critical(NULL, "Error", "Could not open file for write access");
             return;
@@ -67,7 +67,7 @@ void ClassAnalysisOp::operator()(const imagein::Image* img, const std::map<const
         fclose(f);
     }
     else if(dialog->isClassificationStep()) {
-        FILE* f = fopen(dialog->getFileName().toAscii(), "rt" );
+        FILE* f = fopen(dialog->getFileName().toLatin1(), "rt" );
         if(f == NULL) {
             QMessageBox::critical(NULL, "Error", "Could not open file for read access");
             return;
@@ -86,7 +86,7 @@ void ClassAnalysisOp::operator()(const imagein::Image* img, const std::map<const
         fclose(f);
     }
     else {
-        FILE* f = fopen(dialog->getFileName().toAscii(), "rt" );
+        FILE* f = fopen(dialog->getFileName().toLatin1(), "rt" );
         if(f == NULL) {
             QMessageBox::critical(NULL, "Error", "Could not open file for read access");
             return;
diff --git a/app/Widgets/FilterChoice.cpp b/app/Widgets/FilterChoice.cpp
index cde0dfbe4579270f4c47dfaa9478b4eea60daad6..dd12b6f284d1d15e463db76357cd50ceaa209373 100644
--- a/app/Widgets/FilterChoice.cpp
+++ b/app/Widgets/FilterChoice.cpp
@@ -28,22 +28,22 @@
 #include <QTableWidgetItem>
 #include <QHeaderView>
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QComboBox>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpinBox>
-#include <QtGui/QTableView>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QComboBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QTableView>
 
 #include <QFile>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomImplementation>
-#include <QtXml/QDomElement>
+#include <QDomDocument>
+#include <QDomImplementation>
+#include <QDomElement>
 #include <QTextStream>
 
 #include <QGroupBox>
diff --git a/app/Widgets/FilterEditor.cpp b/app/Widgets/FilterEditor.cpp
index 8be74a49290e236a269be515849145b1242a493f..c856ffaf9d7882f84586d7db8fdff517c2c75b41 100644
--- a/app/Widgets/FilterEditor.cpp
+++ b/app/Widgets/FilterEditor.cpp
@@ -24,13 +24,13 @@
 #include <QScrollArea>
 #include <QLineEdit>
 #include <QHBoxLayout>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QLabel>
-#include <QtGui/QSpinBox>
-#include <QtGui/QMdiArea>
-#include <QtGui/QPushButton>
+#include <QButtonGroup>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QSpinBox>
+#include <QMdiArea>
+#include <QPushButton>
 
 #include <QTimer>
 #include <QFile>
diff --git a/app/Widgets/FilterEditor.h b/app/Widgets/FilterEditor.h
index 78a9893843b2c20a93c44779484a6fe900bdb633..3be4281b0f77477f077a69820cd0026caa67b3cd 100644
--- a/app/Widgets/FilterEditor.h
+++ b/app/Widgets/FilterEditor.h
@@ -30,7 +30,7 @@
 #include <QVBoxLayout>
 #include <QString>
 #include <QList>
-#include <QtGui/QTableWidget>
+#include <QTableWidget>
 #include <QMessageBox>
 
 class QLineEdit;
diff --git a/app/Widgets/FilterEditorItem.cpp b/app/Widgets/FilterEditorItem.cpp
index 6dfcba7c316b78f22755bdf81272c451281acd2b..1e8f18f5ba762e8d6d873ad6801a3715b8a88450 100644
--- a/app/Widgets/FilterEditorItem.cpp
+++ b/app/Widgets/FilterEditorItem.cpp
@@ -20,13 +20,13 @@
 #include "FilterEditorItem.h"
 
 #include <QLineEdit>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QLabel>
-#include <QtGui/QSpinBox>
-#include <QtGui/QMdiArea>
-#include <QtGui/QPushButton>
+#include <QButtonGroup>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QSpinBox>
+#include <QMdiArea>
+#include <QPushButton>
 
 #include <QTimer>
 #include <QFile>
diff --git a/app/Widgets/FilterEditorItem.h b/app/Widgets/FilterEditorItem.h
index d653b7f5aa730a49b36bfd559339225629383a33..ba0f9b768a58d6c47605b1bc85b6e54ff2dfb618 100644
--- a/app/Widgets/FilterEditorItem.h
+++ b/app/Widgets/FilterEditorItem.h
@@ -29,7 +29,7 @@
 #include <QVBoxLayout>
 #include <QString>
 #include <QList>
-#include <QtGui/QTableWidget>
+#include <QTableWidget>
 #include <QMessageBox>
 
 class QLineEdit;