diff --git a/src/lib/component/ComponentManager.cpp b/src/lib/component/ComponentManager.cpp
index 3ddc8a65..a4728753 100644
--- a/src/lib/component/ComponentManager.cpp
+++ b/src/lib/component/ComponentManager.cpp
@@ -15,6 +15,16 @@
 #include "ViewFactory.h"
 #include "logging.h"
 
+namespace
+{
+template <class Container>
+void reverseErase(Container & container)
+{
+	while(!container.empty())
+		container.pop_back();
+}
+}	 // namespace
+
 ComponentManager::ComponentManager(const ViewFactory* viewFactory, StorageAccess* storageAccess)
 	: m_componentFactory(viewFactory, storageAccess)
 {
@@ -23,8 +33,8 @@ ComponentManager::ComponentManager(const ViewFactory* viewFactory, StorageAccess
 void ComponentManager::clear()
 {
 	m_dialogViews.clear();
-	m_components.clear();
-	m_singleViews.clear();
+	reverseErase(m_components);
+	reverseErase(m_singleViews);
 }
 
 void ComponentManager::setupMain(ViewLayout* viewLayout, Id appId)
diff --git a/src/lib/data/graph/Token.h b/src/lib/data/graph/Token.h
index 75c2fac2..590fa59c 100644
--- a/src/lib/data/graph/Token.h
+++ b/src/lib/data/graph/Token.h
@@ -3,6 +3,7 @@
 
 #include <typeinfo>
 #include <vector>
+#include <string>
 
 #include "TokenComponent.h"
 #include "types.h"
diff --git a/src/lib_cxx/utility/codeblocks/CodeblocksCompiler.h b/src/lib_cxx/utility/codeblocks/CodeblocksCompiler.h
index 07ce9928..e945b47c 100644
--- a/src/lib_cxx/utility/codeblocks/CodeblocksCompiler.h
+++ b/src/lib_cxx/utility/codeblocks/CodeblocksCompiler.h
@@ -2,8 +2,8 @@
 #define CODEBLOCKS_COMPILER_H
 
 #include <memory>
-#include <set>
 #include <vector>
+#include <string>
 
 class TiXmlElement;