diff --git a/src/plugins/cpptools/cppcodemodelinspectordumper.cpp b/src/plugins/cpptools/cppcodemodelinspectordumper.cpp
index 5a6494c2560..86b5c57d450 100644
--- a/src/plugins/cpptools/cppcodemodelinspectordumper.cpp
+++ b/src/plugins/cpptools/cppcodemodelinspectordumper.cpp
@@ -93,7 +93,6 @@ QString Utils::toString(ProjectExplorer::HeaderPathType type)
 {
 #define CASE_LANGUAGEVERSION(x) case ProjectExplorer::HeaderPathType::x: return QLatin1String(#x"Path")
     switch (type) {
-    CASE_LANGUAGEVERSION(Invalid);
     CASE_LANGUAGEVERSION(User);
     CASE_LANGUAGEVERSION(System);
     CASE_LANGUAGEVERSION(Framework);
@@ -470,7 +469,6 @@ static void printIncludeType(QTextStream &out, ProjectExplorer::HeaderPathType t
 {
     using ProjectExplorer::HeaderPathType;
     switch (type) {
-        case HeaderPathType::Invalid: out << "(invalid include path)"; break;
         case HeaderPathType::User: out << "(user include path)"; break;
         case HeaderPathType::System: out << "(system include path)"; break;
         case HeaderPathType::Framework: out << "(framework path)"; break;
diff --git a/src/plugins/cpptools/cppsourceprocessor.cpp b/src/plugins/cpptools/cppsourceprocessor.cpp
index b16fe4b599f..0f9b94a30ff 100644
--- a/src/plugins/cpptools/cppsourceprocessor.cpp
+++ b/src/plugins/cpptools/cppsourceprocessor.cpp
@@ -301,7 +301,7 @@ QString CppSourceProcessor::resolveFile_helper(const QString &fileName,
     auto headerPathsEnd = m_headerPaths.end();
     const int index = fileName.indexOf(QLatin1Char('/'));
     for (; headerPathsIt != headerPathsEnd; ++headerPathsIt) {
-        if (headerPathsIt->isValid()) {
+        if (!headerPathsIt->path.isNull()) {
             QString path;
             if (headerPathsIt->isFrameworkPath()) {
                 if (index == -1)
diff --git a/src/plugins/projectexplorer/headerpath.h b/src/plugins/projectexplorer/headerpath.h
index db0bb4cc1fb..932c256f33d 100644
--- a/src/plugins/projectexplorer/headerpath.h
+++ b/src/plugins/projectexplorer/headerpath.h
@@ -31,7 +31,6 @@
 namespace ProjectExplorer {
 
 enum class HeaderPathType {
-    Invalid,
     User,
     System,
     Framework
@@ -45,11 +44,6 @@ public:
         : path(path), type(type)
     { }
 
-    bool isValid() const
-    {
-        return type != HeaderPathType::Invalid;
-    }
-
     bool isFrameworkPath() const
     {
         return type == HeaderPathType::Framework;
@@ -66,7 +60,7 @@ public:
     }
 
     QString path;
-    HeaderPathType type = HeaderPathType::Invalid;
+    HeaderPathType type = HeaderPathType::User;
 };
 
 inline uint qHash(const HeaderPath &key, uint seed = 0)