diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index 3a833e85c0..955e93a26f 100644
--- a/src/widgets/dialogs/qfontdialog.cpp
+++ b/src/widgets/dialogs/qfontdialog.cpp
@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include "qwindowdefs.h"
-
-#ifndef QT_NO_FONTDIALOG
-
 #include "qfontdialog.h"
+
+#if QT_CONFIG(fontdialog)
+
 #include "qfontdialog_p.h"
 
 #include <qapplication.h>
@@ -1051,4 +1051,4 @@ QT_END_NAMESPACE
 #include "qfontdialog.moc"
 #include "moc_qfontdialog.cpp"
 
-#endif // QT_NO_FONTDIALOG
+#endif // QT_CONFIG(fontdialog)
diff --git a/src/widgets/itemviews/qcolumnview.cpp b/src/widgets/itemviews/qcolumnview.cpp
index 6c7c914bc0..ea9bbb0fb9 100644
--- a/src/widgets/itemviews/qcolumnview.cpp
+++ b/src/widgets/itemviews/qcolumnview.cpp
@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include <qglobal.h>
-
-#ifndef QT_NO_COLUMNVIEW
-
 #include "qcolumnview.h"
+
+#if QT_CONFIG(columnview)
+
 #include "qcolumnview_p.h"
 #include "qcolumnviewgrip_p.h"
 
@@ -1170,4 +1170,4 @@ QT_END_NAMESPACE
 
 #include "moc_qcolumnview.cpp"
 
-#endif // QT_NO_COLUMNVIEW
+#endif // QT_CONFIG(columnview)
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 68ee8c22d3..d4f15b1315 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include <qglobal.h>
-
-#ifndef QT_NO_STYLE_STYLESHEET
-
 #include "qstylesheetstyle_p.h"
+
+#if QT_CONFIG(style_stylesheet)
+
 #include "private/qcssutil_p.h"
 #include <qdebug.h>
 #include <qapplication.h>
@@ -6024,4 +6024,4 @@ QT_END_NAMESPACE
 
 #include "moc_qstylesheetstyle_p.cpp"
 
-#endif // QT_NO_STYLE_STYLESHEET
+#endif // QT_CONFIG(style_stylesheet)