diff --git a/languages/cpp/cppduchain/contextbuilder.h b/languages/cpp/cppduchain/contextbuilder.h
--- a/languages/cpp/cppduchain/contextbuilder.h
+++ b/languages/cpp/cppduchain/contextbuilder.h
@@ -246,7 +246,7 @@
 #endif
 
   QVector<KDevelop::DUContext::Import> m_importedParentContexts;
-  QStack< QVector<KDevelop::DUContext::Import> > m_tryParentContexts;
+  Stack< QVector<KDevelop::DUContext::Import> > m_tryParentContexts;
   InitializerAST* m_currentInitializer;
   ConditionAST* m_currentCondition;
   
diff --git a/languages/cpp/cppduchain/cppducontext.h b/languages/cpp/cppduchain/cppducontext.h
--- a/languages/cpp/cppduchain/cppducontext.h
+++ b/languages/cpp/cppduchain/cppducontext.h
@@ -51,6 +51,7 @@
 #include <language/duchain/ducontext.h>
 
 #include <QMutex>
+#include <util/stack.h>
 
 #include <language/duchain/abstractfunctiondeclaration.h>
 #include <language/duchain/declaration.h>
@@ -157,7 +158,7 @@
 
         typedef QExplicitlySharedDataPointer<State> StatePtr;
 
-        QStack<StatePtr> m_states;
+        Stack<StatePtr> m_states;
         const DUContext* m_context;
         const TopDUContext* m_source;
         DUContext::SearchFlags m_flags;
diff --git a/languages/cpp/cppduchain/declarationbuilder.h b/languages/cpp/cppduchain/declarationbuilder.h
--- a/languages/cpp/cppduchain/declarationbuilder.h
+++ b/languages/cpp/cppduchain/declarationbuilder.h
@@ -27,6 +27,8 @@
 #include <language/duchain/classfunctiondeclaration.h>
 #include <language/duchain/classdeclaration.h>
 
+#include <util/stack.h>
+
 namespace Cpp
 {
 class TemplateDeclaration;
@@ -164,11 +166,11 @@
   void createFriendDeclaration(AST* range);
   void findDeclarationForDefinition(const QualifiedIdentifier &definitionSearchId);
 
-  QStack<KDevelop::Declaration::AccessPolicy> m_accessPolicyStack;
+  Stack<KDevelop::Declaration::AccessPolicy> m_accessPolicyStack;
 
-  QStack<KDevelop::AbstractFunctionDeclaration::FunctionSpecifiers> m_functionSpecifiers;
-  QStack<KDevelop::ClassMemberDeclaration::StorageSpecifiers> m_storageSpecifiers;
-  QStack<uint> m_functionDefinedStack;
+  Stack<KDevelop::AbstractFunctionDeclaration::FunctionSpecifiers> m_functionSpecifiers;
+  Stack<KDevelop::ClassMemberDeclaration::StorageSpecifiers> m_storageSpecifiers;
+  Stack<uint> m_functionDefinedStack;
 
   bool m_changeWasSignificant, m_ignoreDeclarators;
 
@@ -181,7 +183,7 @@
   FunctionFlag m_functionFlag;
 
   //Ast Mapping members
-  QStack<AST *> m_mappedNodes;
+  Stack<AST *> m_mappedNodes;
 
   bool m_collectQtFunctionSignature;
   QByteArray m_qtFunctionSignature;
@@ -201,7 +203,7 @@
   inline void clearComment() { m_lastComment.clear(); }
 
 private:
-  QStack<Declaration*> m_declarationStack;
+  Stack<Declaration*> m_declarationStack;
   Declaration* m_lastDeclaration;
   QByteArray m_lastComment;  
 };
diff --git a/languages/cpp/cppduchain/typebuilder.h b/languages/cpp/cppduchain/typebuilder.h
--- a/languages/cpp/cppduchain/typebuilder.h
+++ b/languages/cpp/cppduchain/typebuilder.h
@@ -166,7 +166,7 @@
 
   int m_currentEnumeratorValue;
   bool m_lastTypeWasInstance;
-  QStack<KDevelop::AbstractType::Ptr> m_typeStack;
+  Stack<KDevelop::AbstractType::Ptr> m_typeStack;
   KDevelop::AbstractType::Ptr m_lastType;
   bool m_lastTypeWasAuto;
 };
diff --git a/languages/cpp/cppduchain/usebuilder.h b/languages/cpp/cppduchain/usebuilder.h
--- a/languages/cpp/cppduchain/usebuilder.h
+++ b/languages/cpp/cppduchain/usebuilder.h
@@ -96,9 +96,9 @@
 
   inline int& nextUseIndex() { return m_nextUseStack.top(); }
   inline QVector<int>& skippedUses() { return m_skippedUses.top(); }
-  QStack<int> m_nextUseStack;
-  QStack<QVector<int> > m_skippedUses;
-  QStack<DUContext*> m_contexts;
+  Stack<int> m_nextUseStack;
+  Stack<QVector<int> > m_skippedUses;
+  Stack<DUContext*> m_contexts;
 
   QList< QExplicitlySharedDataPointer< KDevelop::Problem > > m_problems;
 };
diff --git a/languages/cpp/cppduchain/usedecoratorvisitor.h b/languages/cpp/cppduchain/usedecoratorvisitor.h
--- a/languages/cpp/cppduchain/usedecoratorvisitor.h
+++ b/languages/cpp/cppduchain/usedecoratorvisitor.h
@@ -23,7 +23,7 @@
 #include <default_visitor.h>
 #include <language/duchain/types/abstracttype.h>
 #include <language/checks/dataaccessrepository.h>
-#include <QStack>
+#include <util/stack.h>
 
 namespace KDevelop {
 class DataAccessRepository;
@@ -65,8 +65,8 @@
     QString nodeToString(AST* node);
     
     const ParseSession* m_session;
-    QStack< QList<KDevelop::DataAccess::DataAccessFlags> > m_callStack;
-    QStack<int> m_argStack;
+    KDevelop::Stack< QList<KDevelop::DataAccess::DataAccessFlags> > m_callStack;
+    KDevelop::Stack<int> m_argStack;
     KDevelop::DataAccess::DataAccessFlags m_defaultFlags;
     KDevelop::DataAccessRepository* m_mods;
 };
diff --git a/languages/cpp/parser/rpp/pp-engine.h b/languages/cpp/parser/rpp/pp-engine.h
--- a/languages/cpp/parser/rpp/pp-engine.h
+++ b/languages/cpp/parser/rpp/pp-engine.h
@@ -26,7 +26,7 @@
 
 #include <QtCore/QHash>
 
-#include <QtCore/QStack>
+#include <util/stack.h>
 #include "cpprppexport.h"
 
 #include <language/duchain/problem.h>
@@ -126,7 +126,7 @@
   pp_skip_comment_or_divop skip_comment_or_divop;
   pp_skip_blanks skip_blanks;
   pp_skip_number skip_number;
-  QStack<KDevelop::IndexedString> m_files;
+  KDevelop::Stack<KDevelop::IndexedString> m_files;
   Preprocessor* m_preprocessor;
   QList<KDevelop::ProblemPointer> m_problems;
 
diff --git a/languages/cpp/parser/rpp/pp-environment.h b/languages/cpp/parser/rpp/pp-environment.h
--- a/languages/cpp/parser/rpp/pp-environment.h
+++ b/languages/cpp/parser/rpp/pp-environment.h
@@ -25,7 +25,7 @@
 #include <QHash>
 #include <QMap>
 
-#include <QStack>
+#include <util/stack.h>
 #include "cpprppexport.h"
 #include "pp-macro.h"
 
diff --git a/languages/qmljs/codecompletion/context.h b/languages/qmljs/codecompletion/context.h
--- a/languages/qmljs/codecompletion/context.h
+++ b/languages/qmljs/codecompletion/context.h
@@ -95,7 +95,7 @@
     QList<KDevelop::CompletionTreeItemPointer> fieldCompletions(const QString &expression,
                                                                 CompletionItem::Decoration decoration);
 
-    QStack<ExpressionStackEntry> expressionStack(const QString& expression);    /*!< @see ExpressionStackEntry */
+    KDevelop::Stack<ExpressionStackEntry> expressionStack(const QString& expression);    /*!< @see ExpressionStackEntry */
     KDevelop::DeclarationPointer declarationAtEndOfString(const QString& expression);
     bool containsOnlySpaces(const QString &str);
 
diff --git a/languages/qmljs/codecompletion/context.cpp b/languages/qmljs/codecompletion/context.cpp
--- a/languages/qmljs/codecompletion/context.cpp
+++ b/languages/qmljs/codecompletion/context.cpp
@@ -247,7 +247,7 @@
 
 QList<CompletionTreeItemPointer> CodeCompletionContext::functionCallTips()
 {
-    QStack<ExpressionStackEntry> stack = expressionStack(m_text);
+    Stack<ExpressionStackEntry> stack = expressionStack(m_text);
     QList<CompletionTreeItemPointer> items;
     int argumentHintDepth = 1;
     bool isTopOfStack = true;
@@ -407,9 +407,9 @@
     }
 }
 
-QStack<CodeCompletionContext::ExpressionStackEntry> CodeCompletionContext::expressionStack(const QString& expression)
+Stack<CodeCompletionContext::ExpressionStackEntry> CodeCompletionContext::expressionStack(const QString& expression)
 {
-    QStack<CodeCompletionContext::ExpressionStackEntry> stack;
+    Stack<CodeCompletionContext::ExpressionStackEntry> stack;
     ExpressionStackEntry entry;
     QmlJS::Lexer lexer(nullptr);
     bool atEnd = false;
diff --git a/languages/qmljs/duchain/declarationbuilder.h b/languages/qmljs/duchain/declarationbuilder.h
--- a/languages/qmljs/duchain/declarationbuilder.h
+++ b/languages/qmljs/duchain/declarationbuilder.h
@@ -25,6 +25,8 @@
 
 #include "contextbuilder.h"
 
+#include <util/stack.h>
+
 namespace KDevelop
 {
     class ClassDeclaration;
@@ -169,7 +171,7 @@
 
 private:
     bool m_prebuilding;
-    QStack<bool> m_skipEndVisit;
+    KDevelop::Stack<bool> m_skipEndVisit;
 };
 
 #endif // DECLARATIONBUILDER_H
diff --git a/languages/qmljs/duchain/expressionvisitor.h b/languages/qmljs/duchain/expressionvisitor.h
--- a/languages/qmljs/duchain/expressionvisitor.h
+++ b/languages/qmljs/duchain/expressionvisitor.h
@@ -19,7 +19,7 @@
 #ifndef EXPRESSIONVISITOR_H
 #define EXPRESSIONVISITOR_H
 
-#include <QStack>
+#include <util/stack.h>
 
 #include <language/duchain/builders/dynamiclanguageexpressionvisitor.h>
 #include <language/duchain/types/integraltype.h>
diff --git a/languages/qmljs/duchain/usebuilder.h b/languages/qmljs/duchain/usebuilder.h
--- a/languages/qmljs/duchain/usebuilder.h
+++ b/languages/qmljs/duchain/usebuilder.h
@@ -20,7 +20,7 @@
 #define USEBUILDER_H
 
 #include <language/duchain/builders/abstractusebuilder.h>
-#include <QtCore/QStack>
+#include <util/stack.h>
 
 #include "contextbuilder.h"
 
@@ -50,7 +50,7 @@
     void useForExpression(QmlJS::AST::Node* node, const KDevelop::RangeInRevision &range = KDevelop::RangeInRevision::invalid());
 
 private:
-    QStack<QmlJS::AST::Node*> m_nodesThatOpenedContexts;
+    KDevelop::Stack<QmlJS::AST::Node*> m_nodesThatOpenedContexts;
 };
 
 #endif // USEBUILDER_H
diff --git a/projectmanagers/cmake/duchain/usebuilder.h b/projectmanagers/cmake/duchain/usebuilder.h
--- a/projectmanagers/cmake/duchain/usebuilder.h
+++ b/projectmanagers/cmake/duchain/usebuilder.h
@@ -21,7 +21,7 @@
 #ifndef USEBUILDER_H
 #define USEBUILDER_H
 
-#include <QtCore/QStack>
+#include <util/stack.h>
 
 #include "contextbuilder.h"
 
diff --git a/projectmanagers/cmake/parser/cmakelistsparser.cpp b/projectmanagers/cmake/parser/cmakelistsparser.cpp
--- a/projectmanagers/cmake/parser/cmakelistsparser.cpp
+++ b/projectmanagers/cmake/parser/cmakelistsparser.cpp
@@ -24,7 +24,7 @@
 #include "astfactory.h"
 #include "../debug.h"
 
-#include <QStack>
+#include <util/stack.h>
 #include <QDir>
 
 QMap<QChar, QChar> whatToScape()
diff --git a/projectmanagers/cmake/parser/cmakeprojectvisitor.h b/projectmanagers/cmake/parser/cmakeprojectvisitor.h
--- a/projectmanagers/cmake/parser/cmakeprojectvisitor.h
+++ b/projectmanagers/cmake/parser/cmakeprojectvisitor.h
@@ -24,7 +24,7 @@
 #include <QString>
 #include <QStringList>
 #include <QHash>
-#include <QStack>
+#include <util/stack.h>
 
 #include "cmakeastvisitor.h"
 #include "cmaketypes.h"
@@ -178,7 +178,7 @@
         bool haveToFind(const QString &varName);
         void createDefinitions(const CMakeAst* ast);
         void createUses(const CMakeFunctionDesc& ast);
-        void printBacktrace(const QStack<VisitorState> &backtrace);
+        void printBacktrace(const KDevelop::Stack<VisitorState> &backtrace);
         VisitorState stackTop() const;
         QStringList dependees(const QString& s) const;
         int declareFunction(Macro m, const CMakeFileContent& content, int initial, const QString& end);
@@ -193,7 +193,7 @@
         QHash<QString, QStringList> m_generatedFiles;
         QHash<QString, Target> m_targetForId;
         
-        QStack<VisitorState> m_backtrace;
+        KDevelop::Stack<VisitorState> m_backtrace;
         QString m_root;
         VariableMap *m_vars;
         MacroMap *m_macros;
diff --git a/projectmanagers/cmake/parser/cmakeprojectvisitor.cpp b/projectmanagers/cmake/parser/cmakeprojectvisitor.cpp
--- a/projectmanagers/cmake/parser/cmakeprojectvisitor.cpp
+++ b/projectmanagers/cmake/parser/cmakeprojectvisitor.cpp
@@ -96,7 +96,7 @@
 QList< CMakeProjectVisitor::IntPair > CMakeProjectVisitor::parseArgument(const QString &exp)
 {
     QString name;
-    QStack<int> opened;
+    Stack<int> opened;
     QList< IntPair > pos;
     bool gotDollar=false;
     for(int i=exp.indexOf('$'); i<exp.size() && i>=0; i++)
@@ -392,7 +392,7 @@
     return 1;
 }
 
-void CMakeProjectVisitor::printBacktrace(const QStack<VisitorState> &backtrace)
+void CMakeProjectVisitor::printBacktrace(const Stack<VisitorState> &backtrace)
 {
     int i=0;
     qCDebug(CMAKE) << "backtrace" << backtrace.count();
@@ -410,7 +410,7 @@
 {
     VisitorState p = {};
     QString filename=m_backtrace.front().code->at(m_backtrace.front().line).filePath;
-    QStack<VisitorState>::const_iterator it=m_backtrace.constBegin();
+    Stack<VisitorState>::const_iterator it=m_backtrace.constBegin();
 
     for(; it!=m_backtrace.constEnd(); ++it)
     {
diff --git a/projectmanagers/cmake/parser/variablemap.h b/projectmanagers/cmake/parser/variablemap.h
--- a/projectmanagers/cmake/parser/variablemap.h
+++ b/projectmanagers/cmake/parser/variablemap.h
@@ -25,7 +25,7 @@
 #include <QStringList>
 #include "cmakecommonexport.h"
 #include <QSet>
-#include <QStack>
+#include <util/stack.h>
 
 class KDEVCMAKECOMMON_EXPORT VariableMap : public QHash<QString, QStringList>
 {
@@ -56,7 +56,7 @@
         /** will create a variable without adding a scope on it */
         void insertGlobal(const QString& key, const QStringList& value);
     private:
-        QStack<QSet<QString> > m_scopes;
+        KDevelop::Stack<QSet<QString> > m_scopes;
 };
 
 #endif
diff --git a/projectmanagers/qmake/parser/CMakeLists.txt b/projectmanagers/qmake/parser/CMakeLists.txt
--- a/projectmanagers/qmake/parser/CMakeLists.txt
+++ b/projectmanagers/qmake/parser/CMakeLists.txt
@@ -26,7 +26,10 @@
 
 add_library(kdevqmakeparser STATIC ${kdevqmakeparser_SRCS} ${parser_GEN_SRCS})
 generate_export_header(kdevqmakeparser BASE_NAME parser EXPORT_MACRO_NAME KDEVQMAKEPARSER_EXPORT)
-target_link_libraries(kdevqmakeparser LINK_PRIVATE
+target_link_libraries(kdevqmakeparser
+LINK_PUBLIC
+    KDev::Util
+LINK_PRIVATE
     KF5::CoreAddons
     KF5::KIOCore
 )
diff --git a/projectmanagers/qmake/parser/buildastvisitor.h b/projectmanagers/qmake/parser/buildastvisitor.h
--- a/projectmanagers/qmake/parser/buildastvisitor.h
+++ b/projectmanagers/qmake/parser/buildastvisitor.h
@@ -22,7 +22,7 @@
 #define BUILDASTVISITOR_H
 
 #include "qmakedefaultvisitor.h"
-#include <QtCore/QStack>
+#include <util/stack.h>
 
 class QString;
 
@@ -61,7 +61,7 @@
     template <typename T> T* stackPop();
     template <typename T> T* createAst( AstNode* node, AST* ast );
 
-    QStack<AST*> aststack;
+    KDevelop::Stack<AST*> aststack;
     Parser* m_parser;
 };
 
diff --git a/projectmanagers/qmake/parser/qmakelexer.h b/projectmanagers/qmake/parser/qmakelexer.h
--- a/projectmanagers/qmake/parser/qmakelexer.h
+++ b/projectmanagers/qmake/parser/qmakelexer.h
@@ -21,7 +21,7 @@
 #ifndef QMAKELEXER_H
 #define QMAKELEXER_H
 
-#include <QtCore/QStack>
+#include <util/stack.h>
 #include <QtCore/QString>
 #include "parser_export.h"
 
@@ -56,7 +56,7 @@
     QChar* ignoreWhitespaceAndComment(QChar* it);
     void createNewline( int pos );
 
-    QStack<int> mState;
+    KDevelop::Stack<int> mState;
     enum State
     {
         ErrorState = -1,
diff --git a/projectmanagers/qmake/qmakefile.h b/projectmanagers/qmake/qmakefile.h
--- a/projectmanagers/qmake/qmakefile.h
+++ b/projectmanagers/qmake/qmakefile.h
@@ -22,7 +22,7 @@
 #define QMAKEFILE_H
 
 
-#include <QtCore/QStack>
+#include <util/stack.h>
 #include <QtCore/QStringList>
 
 #include "qmakefilevisitor.h"
diff --git a/providers/kdeprovider/kdeprojectsreader.h b/providers/kdeprovider/kdeprojectsreader.h
--- a/providers/kdeprovider/kdeprojectsreader.h
+++ b/providers/kdeprovider/kdeprojectsreader.h
@@ -18,9 +18,12 @@
 
 #ifndef KDEPROJECTSREADER_H
 #define KDEPROJECTSREADER_H
+
 #include "kdeprojectsmodel.h"
+
+#include <util/stack.h>
+
 #include <QNetworkReply>
-#include <QStack>
 
 class KDEProjectsReader : public QObject
 {
@@ -38,7 +41,7 @@
         void downloadDone();
         
     private:
-        QStack<Source> m_current;
+        KDevelop::Stack<Source> m_current;
         QStringList m_errors;
         KDEProjectsModel* m_m;
 };