diff --git a/util/qlalr/compress.cpp b/util/qlalr/compress.cpp
index bd35b171cf97901c301252bd976454f0a7a003ad..aefcb03cd62ace56b5885a791872c1fa94c321e8 100644
--- a/util/qlalr/compress.cpp
+++ b/util/qlalr/compress.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
+#include "compress.h"
 
-#include <QtCore/QtDebug>
-#include <QtCore/QList>
+#include <QtCore/qdebug.h>
+#include <QtCore/qlist.h>
 
 #include <algorithm>
 #include <iterator>
 #include <iostream>
-#include "compress.h"
 
 #define QLALR_NO_CHECK_SORTED_TABLE
 
diff --git a/util/qlalr/compress.h b/util/qlalr/compress.h
index 64c2bba14c0fa2b9d648142b133932e215660ae9..72f1d1db83fd33f3586ae4c0f0eb897321d6b679 100644
--- a/util/qlalr/compress.h
+++ b/util/qlalr/compress.h
@@ -42,7 +42,7 @@
 #ifndef COMPRESS_H
 #define COMPRESS_H
 
-#include <QtCore/QVector>
+#include <QtCore/qvector.h>
 
 class Compress
 {
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index c62ee78917ad25804ab34ff0307d7f9a771ea095..d48c05939700be31a14fda365ef962f60ecef9ba 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -39,15 +39,16 @@
 **
 ****************************************************************************/
 
+#include "cppgenerator.h"
+
+#include "lalr.h"
+#include "recognizer.h"
 
 #include <QtCore/qbitarray.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qmap.h>
 
-#include "cppgenerator.h"
-#include "lalr.h"
-#include "recognizer.h"
 
 QString CppGenerator::copyrightHeader() const
 {
diff --git a/util/qlalr/dotgraph.cpp b/util/qlalr/dotgraph.cpp
index de3ff8311225cc93dce09eb06a8f34924233c501..60ec82ae84535c00b5db4b267301ad8d71342386 100644
--- a/util/qlalr/dotgraph.cpp
+++ b/util/qlalr/dotgraph.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-
-#include <QtCore/QTextStream>
+#include "dotgraph.h"
 
 #include "lalr.h"
-#include "dotgraph.h"
+
+#include <QtCore/qtextstream.h>
 
 DotGraph::DotGraph(QTextStream &o):
   out (o)
diff --git a/util/qlalr/dotgraph.h b/util/qlalr/dotgraph.h
index 587817d4d21671f8cea38609e7f02e6d17b13667..1d21db060a4d25a923ee427993b8f781bbcd5507 100644
--- a/util/qlalr/dotgraph.h
+++ b/util/qlalr/dotgraph.h
@@ -42,6 +42,8 @@
 #ifndef DOTGRAPH_H
 #define DOTGRAPH_H
 
+#include <QtCore/qglobal.h>
+
 QT_FORWARD_DECLARE_CLASS(QTextStream);
 class Automaton;
 
diff --git a/util/qlalr/lalr.cpp b/util/qlalr/lalr.cpp
index 6a14c0d701ddb7c0d861b55c481255b85ecf220c..7377bf63218443e6f7988cf68ffd69c41d835ba8 100644
--- a/util/qlalr/lalr.cpp
+++ b/util/qlalr/lalr.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-
 #include "lalr.h"
+
 #include <limits.h>
 
 #include <algorithm>
diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g
index b744d7ea651b5d76bed0d34314c0519aa34d958c..e060eea6f19de7f4ac679c37f503e34782400473 100644
--- a/util/qlalr/lalr.g
+++ b/util/qlalr/lalr.g
@@ -116,14 +116,15 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QtDebug>
-#include <QtCore/QString>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-
 #include "$header"
+
 #include "lalr.h"
 
+#include <QtCore/qdebug.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qtextstream.h>
+
 #include <cstdlib>
 
 class Recognizer: protected $table
@@ -231,6 +232,7 @@ protected:
 ****************************************************************************/
 
 #include "recognizer.h"
+
 #include <cstdlib>
 #include <cstring>
 #include <cctype>
diff --git a/util/qlalr/lalr.h b/util/qlalr/lalr.h
index a4649d09b5699bfda316952f10f9111f6eca7dd0..7f62b411ca018848a228163bb7308cb005d27d64 100644
--- a/util/qlalr/lalr.h
+++ b/util/qlalr/lalr.h
@@ -42,15 +42,15 @@
 #ifndef LALR_H
 #define LALR_H
 
-#include <functional>
+#include <QtCore/qset.h>
+#include <QtCore/qstack.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qlinkedlist.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qtextstream.h>
+#include <QtCore/qpair.h>
 
-#include <QtCore/QSet>
-#include <QtCore/QStack>
-#include <QtCore/QMap>
-#include <QtCore/QLinkedList>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
-#include <QtCore/QPair>
+#include <functional>
 
 class Rule;
 class State;
diff --git a/util/qlalr/main.cpp b/util/qlalr/main.cpp
index 203e4dec666082ab3472a264da6dfa8d30c6b21e..1e4f030122d2680064b5b0e3ef6e72746ca588c2 100644
--- a/util/qlalr/main.cpp
+++ b/util/qlalr/main.cpp
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QStringList>
-#include <QtCore/QtDebug>
-
-#include <cstdlib>
-
 #include "lalr.h"
 #include "dotgraph.h"
 #include "parsetable.h"
 #include "cppgenerator.h"
 #include "recognizer.h"
 
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qdebug.h>
+
+#include <cstdlib>
+
 #define QLALR_NO_DEBUG_TABLE
 #define QLALR_NO_DEBUG_DOT
 
diff --git a/util/qlalr/parsetable.cpp b/util/qlalr/parsetable.cpp
index 25c7f8f8d6ab1b3e3fc41863f6d4cc21b9583597..6877af7a000595bdb88115fcd5e0c5dd88eb018c 100644
--- a/util/qlalr/parsetable.cpp
+++ b/util/qlalr/parsetable.cpp
@@ -39,10 +39,11 @@
 **
 ****************************************************************************/
 
+#include "parsetable.h"
 
-#include <QtCore/QTextStream>
 #include "lalr.h"
-#include "parsetable.h"
+
+#include <QtCore/qtextstream.h>
 
 ParseTable::ParseTable (QTextStream &o):
   out (o)
diff --git a/util/qlalr/parsetable.h b/util/qlalr/parsetable.h
index 75922ab16b9afbc066bf4963f09364d473e5e673..d0fe78be813b85d5117dad213cae086d3f666c46 100644
--- a/util/qlalr/parsetable.h
+++ b/util/qlalr/parsetable.h
@@ -42,6 +42,8 @@
 #ifndef PARSETABLE_H
 #define PARSETABLE_H
 
+#include <QtCore/qglobal.h>
+
 QT_FORWARD_DECLARE_CLASS(QTextStream);
 class Automaton;
 
diff --git a/util/qlalr/recognizer.cpp b/util/qlalr/recognizer.cpp
index d68d6fb78bcecc5abf01cdbf3580d3621487868f..6808f3f66becefeb175ef3fe3a3bf7fb20fa4ffa 100644
--- a/util/qlalr/recognizer.cpp
+++ b/util/qlalr/recognizer.cpp
@@ -41,6 +41,7 @@
 ****************************************************************************/
 
 #include "recognizer.h"
+
 #include <cstdlib>
 #include <cstring>
 #include <cctype>
diff --git a/util/qlalr/recognizer.h b/util/qlalr/recognizer.h
index 9c64fac043c4883572888bdc68ccad5da0bf7a3c..8eb089eb8d8df643ab98127b7c0afc38590a63ae 100644
--- a/util/qlalr/recognizer.h
+++ b/util/qlalr/recognizer.h
@@ -40,14 +40,15 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QtDebug>
-#include <QtCore/QString>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-
 #include "grammar_p.h"
+
 #include "lalr.h"
 
+#include <QtCore/qdebug.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qtextstream.h>
+
 #include <cstdlib>
 
 class Recognizer: protected grammar