diff --git a/src/qdoc/helpprojectwriter.cpp b/src/qdoc/helpprojectwriter.cpp
index e9c6fcc73273a2b61ec6f4809b420ddf9b951e6f..3ab92b641f40b25434bb91dc3a6cdf6c71e27346 100644
--- a/src/qdoc/helpprojectwriter.cpp
+++ b/src/qdoc/helpprojectwriter.cpp
@@ -236,7 +236,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
     if (!node->url().isEmpty() && !(project.includeIndexNodes && !node->url().startsWith("http")))
         return false;
 
-    if (node->access() == Node::Private || node->status() == Node::Internal)
+    if (node->isPrivate() || node->isInternal())
         return false;
 
     if (node->name().isEmpty())
@@ -269,15 +269,14 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
                 }
             }
             // Accept only the node types in the selectors hash.
-            else if (node->type() != Node::Document)
+            else if (!node->isDocumentNode())
                 project.subprojects[i].nodes[objName] = node;
             else {
                 // Accept only doc nodes with subtypes contained in the selector's
                 // mask.
                 const DocumentNode *docNode = static_cast<const DocumentNode *>(node);
                 if (subproject.selectors[node->type()].contains(docNode->docSubtype()) &&
-                        docNode->docSubtype() != Node::ExternalPage &&
-                        !docNode->fullTitle().isEmpty()) {
+                    !docNode->isExternalPage() && !docNode->fullTitle().isEmpty()) {
 
                     project.subprojects[i].nodes[objName] = node;
                 }
@@ -416,8 +415,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
         // attributes.
     case Node::Document: {
         const DocumentNode *docNode = static_cast<const DocumentNode*>(node);
-        if (docNode->docSubtype() != Node::ExternalPage &&
-                docNode->docSubtype() != Node::Image &&
+        if (!docNode->isExternalPage() && docNode->docSubtype() != Node::Image &&
                 !docNode->fullTitle().isEmpty()) {
 
             if (docNode->docSubtype() != Node::File) {
@@ -479,10 +477,10 @@ void HelpProjectWriter::generateSections(HelpProject &project,
             if (childNode->isIndexNode())
                 continue;
 
-            if (childNode->access() == Node::Private)
+            if (childNode->isPrivate())
                 continue;
 
-            if (childNode->type() == Node::Document) {
+            if (childNode->isDocumentNode()) {
                 childSet << childNode;
             }
             else if (childNode->isQmlPropertyGroup() || childNode->isJsPropertyGroup()) {
@@ -497,7 +495,7 @@ void HelpProjectWriter::generateSections(HelpProject &project,
                  */
                 const Aggregate* inner = static_cast<const Aggregate*>(childNode);
                 foreach (const Node* n, inner->childNodes()) {
-                    if (n->access() == Node::Private)
+                    if (n->isPrivate())
                         continue;
                     childSet << n;
                 }
@@ -509,7 +507,7 @@ void HelpProjectWriter::generateSections(HelpProject &project,
                     project.memberStatus[childNode->relates()].insert(childNode->status());
                 }
 
-                if (childNode->type() == Node::Function) {
+                if (childNode->isFunction()) {
                     const FunctionNode *funcNode = static_cast<const FunctionNode *>(childNode);
                     if (funcNode->isOverload())
                         continue;
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index a328b7af13313b04613f1a0c572655b2e81b8d5f..79cde7950f4e21bb2134816cbfa327755d4d344f 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -704,9 +704,11 @@ void QDocCommandLineParser::process(const QCoreApplication &app)
     const auto paths = values(includePathOption);
     for (const auto &i : paths)
         includesPaths << "-I" << currentDir.absoluteFilePath(i);
+#ifdef QDOC_PASS_ISYSTEM
     const auto paths2 = values(includePathSystemOption);
     for (const auto &i : paths2)
         includesPaths << "-isystem" << currentDir.absoluteFilePath(i);
+#endif
     const auto paths3 = values(frameworkOption);
     for (const auto &i : paths3)
         includesPaths << "-F" << currentDir.absoluteFilePath(i);