diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc
index 1b77d98282d0dc2d7e8547672ce696ef91efb80b..579821bdd8b19e7ff994572ce195331234f72f77 100644
--- a/doc/addressbook-sdk.qdoc
+++ b/doc/addressbook-sdk.qdoc
@@ -338,9 +338,6 @@
     Since the \c AddressBook class is a subclass of QWidget, Qt Creator
     includes QWidget in the header file.
 
-    ## this is a bit confusing, because QWidget is already included, but without QtGui/
-    ## Also, how about ordering the includes by module?
-
     \snippet examples/addressbook-sdk/part2/addressbook.h include
 
     We need a container to store our address book contacts, so that we can
diff --git a/doc/examples/addressbook-sdk/part1/addressbook.h b/doc/examples/addressbook-sdk/part1/addressbook.h
index c5937d435b80738824c8e793532d11f0248b0787..787cbde184c84bbdb36eaf1b439c3a1189228796 100644
--- a/doc/examples/addressbook-sdk/part1/addressbook.h
+++ b/doc/examples/addressbook-sdk/part1/addressbook.h
@@ -2,7 +2,7 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace Ui
 {
diff --git a/doc/examples/addressbook-sdk/part1/main.cpp b/doc/examples/addressbook-sdk/part1/main.cpp
index 3378b4adce42d3e0d34cad8fc997a92a65394be8..7b8bc7babe79f3a661b971e2f82b3aea3a810455 100644
--- a/doc/examples/addressbook-sdk/part1/main.cpp
+++ b/doc/examples/addressbook-sdk/part1/main.cpp
@@ -1,5 +1,5 @@
 //! [main function]
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"
 
 int main(int argc, char *argv[])
diff --git a/doc/examples/addressbook-sdk/part2/addressbook.h b/doc/examples/addressbook-sdk/part2/addressbook.h
index 6bd342769071716b97da4ce29579ce10017eb67a..3f4c7224c135f579d70b81d123e822a0fc0592af 100644
--- a/doc/examples/addressbook-sdk/part2/addressbook.h
+++ b/doc/examples/addressbook-sdk/part2/addressbook.h
@@ -2,9 +2,9 @@
 #define ADDRESSBOOK_H
 
 //! [include]
-#include <QtGui/QWidget>
-#include <QtCore/QMap>
-#include <QtGui/QMessageBox>
+#include <QWidget>
+#include <QMap>
+#include <QMessageBox>
 //! [include]
 
 namespace Ui
diff --git a/doc/examples/addressbook-sdk/part2/main.cpp b/doc/examples/addressbook-sdk/part2/main.cpp
index 3378b4adce42d3e0d34cad8fc997a92a65394be8..7b8bc7babe79f3a661b971e2f82b3aea3a810455 100644
--- a/doc/examples/addressbook-sdk/part2/main.cpp
+++ b/doc/examples/addressbook-sdk/part2/main.cpp
@@ -1,5 +1,5 @@
 //! [main function]
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"
 
 int main(int argc, char *argv[])
diff --git a/doc/examples/addressbook-sdk/part3/addressbook.h b/doc/examples/addressbook-sdk/part3/addressbook.h
index 79b43b9c428c69f905f47cf9a152b68027927573..c9608d0c64776c333802da290a08c71d4f0fd1f5 100644
--- a/doc/examples/addressbook-sdk/part3/addressbook.h
+++ b/doc/examples/addressbook-sdk/part3/addressbook.h
@@ -1,9 +1,9 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H
 
-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtCore/QMap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QMap>
 
 namespace Ui
 {
diff --git a/doc/examples/addressbook-sdk/part3/main.cpp b/doc/examples/addressbook-sdk/part3/main.cpp
index 437a1c8352a8e1d5b94bc9d57c81452b336d1568..e7f9a73348f50f824c245e19469f7a99ac98a41c 100644
--- a/doc/examples/addressbook-sdk/part3/main.cpp
+++ b/doc/examples/addressbook-sdk/part3/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"
 
 int main(int argc, char *argv[])
diff --git a/doc/examples/addressbook-sdk/part4/addressbook.h b/doc/examples/addressbook-sdk/part4/addressbook.h
index 088cc436ced78a8f46d2c9ef8ef73f15c9a526c2..4c8b8c8c6886a7d5729ee188bf5c33a931f3be56 100644
--- a/doc/examples/addressbook-sdk/part4/addressbook.h
+++ b/doc/examples/addressbook-sdk/part4/addressbook.h
@@ -1,9 +1,9 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H
 
-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtCore/QMap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QMap>
 
 
 namespace Ui
diff --git a/doc/examples/addressbook-sdk/part4/main.cpp b/doc/examples/addressbook-sdk/part4/main.cpp
index 437a1c8352a8e1d5b94bc9d57c81452b336d1568..e7f9a73348f50f824c245e19469f7a99ac98a41c 100644
--- a/doc/examples/addressbook-sdk/part4/main.cpp
+++ b/doc/examples/addressbook-sdk/part4/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"
 
 int main(int argc, char *argv[])
diff --git a/doc/examples/addressbook-sdk/part5/addressbook.h b/doc/examples/addressbook-sdk/part5/addressbook.h
index c0cbf32599a1742759ee7feafad15dfc03b9eedf..0bcf8402b1134acdf79c34f8aacb22532d9c982a 100644
--- a/doc/examples/addressbook-sdk/part5/addressbook.h
+++ b/doc/examples/addressbook-sdk/part5/addressbook.h
@@ -1,9 +1,9 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H
 
-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtCore/QMap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QMap>
 //! [include]
 #include "finddialog.h"
 //! [include]
diff --git a/doc/examples/addressbook-sdk/part5/finddialog.h b/doc/examples/addressbook-sdk/part5/finddialog.h
index 9912dec8dfca5a994ec442026464320508f5e2ac..3e324731cbd88352b8ccc6e6684e81c30fcd3ea4 100644
--- a/doc/examples/addressbook-sdk/part5/finddialog.h
+++ b/doc/examples/addressbook-sdk/part5/finddialog.h
@@ -1,9 +1,9 @@
 #ifndef FINDDIALOG_H
 #define FINDDIALOG_H
 
-#include <QtGui/QDialog>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
+#include <QDialog>
+#include <QLineEdit>
+#include <QPushButton>
 
 namespace Ui {
     class FindDialog;
diff --git a/doc/examples/addressbook-sdk/part5/main.cpp b/doc/examples/addressbook-sdk/part5/main.cpp
index 437a1c8352a8e1d5b94bc9d57c81452b336d1568..e7f9a73348f50f824c245e19469f7a99ac98a41c 100644
--- a/doc/examples/addressbook-sdk/part5/main.cpp
+++ b/doc/examples/addressbook-sdk/part5/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"
 
 int main(int argc, char *argv[])
diff --git a/doc/examples/addressbook-sdk/part6/addressbook.h b/doc/examples/addressbook-sdk/part6/addressbook.h
index 2dd06cb9aeaada07497fffff7c550766673aed47..303c53a7aea7f38445c1e1357e293f3dc43b1fff 100644
--- a/doc/examples/addressbook-sdk/part6/addressbook.h
+++ b/doc/examples/addressbook-sdk/part6/addressbook.h
@@ -1,9 +1,9 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H
 
-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtCore/QMap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QMap>
 #include "finddialog.h"
 
 namespace Ui
diff --git a/doc/examples/addressbook-sdk/part6/finddialog.h b/doc/examples/addressbook-sdk/part6/finddialog.h
index 1166102537c03e0188956b25830d33b97bcc9fc9..58884bf43aaf414d733af501c112601b0a6a5655 100644
--- a/doc/examples/addressbook-sdk/part6/finddialog.h
+++ b/doc/examples/addressbook-sdk/part6/finddialog.h
@@ -1,9 +1,9 @@
 #ifndef FINDDIALOG_H
 #define FINDDIALOG_H
 
-#include <QtGui/QDialog>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
+#include <QDialog>
+#include <QLineEdit>
+#include <QPushButton>
 
 namespace Ui {
     class FindDialog;
diff --git a/doc/examples/addressbook-sdk/part6/main.cpp b/doc/examples/addressbook-sdk/part6/main.cpp
index 437a1c8352a8e1d5b94bc9d57c81452b336d1568..e7f9a73348f50f824c245e19469f7a99ac98a41c 100644
--- a/doc/examples/addressbook-sdk/part6/main.cpp
+++ b/doc/examples/addressbook-sdk/part6/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"
 
 int main(int argc, char *argv[])
diff --git a/doc/examples/addressbook-sdk/part7/addressbook.h b/doc/examples/addressbook-sdk/part7/addressbook.h
index 2c3b6d5e5d7342d7300ff0b0ff7105ff237bc34a..824d63d14d0bbfea1f69090dbf1948023d403420 100644
--- a/doc/examples/addressbook-sdk/part7/addressbook.h
+++ b/doc/examples/addressbook-sdk/part7/addressbook.h
@@ -1,9 +1,9 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H
 
-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtCore/QMap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QMap>
 #include "finddialog.h"
 
 namespace Ui
diff --git a/doc/examples/addressbook-sdk/part7/finddialog.h b/doc/examples/addressbook-sdk/part7/finddialog.h
index 1166102537c03e0188956b25830d33b97bcc9fc9..58884bf43aaf414d733af501c112601b0a6a5655 100644
--- a/doc/examples/addressbook-sdk/part7/finddialog.h
+++ b/doc/examples/addressbook-sdk/part7/finddialog.h
@@ -1,9 +1,9 @@
 #ifndef FINDDIALOG_H
 #define FINDDIALOG_H
 
-#include <QtGui/QDialog>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
+#include <QDialog>
+#include <QLineEdit>
+#include <QPushButton>
 
 namespace Ui {
     class FindDialog;
diff --git a/doc/examples/addressbook-sdk/part7/main.cpp b/doc/examples/addressbook-sdk/part7/main.cpp
index 437a1c8352a8e1d5b94bc9d57c81452b336d1568..e7f9a73348f50f824c245e19469f7a99ac98a41c 100644
--- a/doc/examples/addressbook-sdk/part7/main.cpp
+++ b/doc/examples/addressbook-sdk/part7/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"
 
 int main(int argc, char *argv[])