diff --git a/src/corelib/global/qglobal_p.h b/src/corelib/global/qglobal_p.h
index d6e84acd3e0..258cdccf47d 100644
--- a/src/corelib/global/qglobal_p.h
+++ b/src/corelib/global/qglobal_p.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 Q_CORE_EXPORT void qTzSet();
 Q_CORE_EXPORT time_t qMkTime(struct tm *when);
 
-#if !defined(Q_CC_MSVC)
+#if !defined(Q_CC_MSVC) || defined(Q_CC_CLANG)
 Q_NORETURN
 #endif
 Q_CORE_EXPORT void qAbort();
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index 213273ed67c..1ab9ca6dbf8 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -159,7 +159,7 @@ using namespace Qt::StringLiterals;
     \snippet code/src_corelib_global_qglobal.cpp 4
 */
 
-#if !defined(Q_CC_MSVC)
+#if !defined(Q_CC_MSVC) || defined(Q_CC_CLANG)
 Q_NORETURN
 #endif
 static void qt_message_fatal(QtMsgType, const QMessageLogContext &context, const QString &message);
diff --git a/src/corelib/global/qversiontagging.h b/src/corelib/global/qversiontagging.h
index e64cae1d879..05d0998c452 100644
--- a/src/corelib/global/qversiontagging.h
+++ b/src/corelib/global/qversiontagging.h
@@ -86,7 +86,7 @@ struct QVersionTag
 //   Calling convention on other architectures does not prepend a _
 #    define QT_MANGLE_IMPORT_PREFIX     __imp_
 #  endif
-#  ifdef Q_CC_MSVC
+#  if defined(Q_CC_MSVC_ONLY)
 #    pragma section(".qtversion",read,shared)
 #    define QT_VERSION_TAG_SECTION      __declspec(allocate(".qtversion"))
 #    define QT_VERSION_TAG_ATTRIBUTE    __declspec(selectany) extern const
diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp
index ac27d365acb..5b7bec336e0 100644
--- a/src/corelib/mimetypes/qmimeprovider.cpp
+++ b/src/corelib/mimetypes/qmimeprovider.cpp
@@ -20,7 +20,7 @@
 #include <QtEndian>
 
 #if QT_CONFIG(mimetype_database)
-#  if defined(Q_CC_MSVC)
+#  if defined(Q_CC_MSVC_ONLY)
 #    pragma section(".qtmimedatabase", read, shared)
 __declspec(allocate(".qtmimedatabase")) __declspec(align(4096))
 #  elif defined(Q_OS_DARWIN)
diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h
index 24ce2d50af7..242f11122fb 100644
--- a/src/network/socket/qhttpsocketengine_p.h
+++ b/src/network/socket/qhttpsocketengine_p.h
@@ -16,10 +16,12 @@
 //
 
 #include <QtNetwork/private/qtnetworkglobal_p.h>
-#include "private/qabstractsocketengine_p.h"
+
+#include <QtNetwork/qnetworkproxy.h>
+
 #include "qabstractsocket.h"
-#include "qnetworkproxy.h"
 #include "private/qauthenticator_p.h"
+#include "private/qabstractsocketengine_p.h"
 
 QT_REQUIRE_CONFIG(http);
 
diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h
index c446f47184a..790c3077cf7 100644
--- a/src/network/socket/qsocks5socketengine_p.h
+++ b/src/network/socket/qsocks5socketengine_p.h
@@ -16,8 +16,10 @@
 //
 
 #include <QtNetwork/private/qtnetworkglobal_p.h>
+
+#include <QtNetwork/qnetworkproxy.h>
+
 #include "qabstractsocketengine_p.h"
-#include "qnetworkproxy.h"
 
 QT_REQUIRE_CONFIG(socks5);