diff --git a/bin/app/data/ProjectSettings_template.xml b/bin/app/data/ProjectSettings_template.xml
index 1ad426df..4b85b0f2 100644
--- a/bin/app/data/ProjectSettings_template.xml
+++ b/bin/app/data/ProjectSettings_template.xml
@@ -24,5 +24,11 @@
 		<FrameworkSearchPaths>
 			<FrameworkSearchPath><!-- STRING: framework search path --></FrameworkSearchPath>
 		</FrameworkSearchPaths>
+
+		<Extensions>
+			<HeaderExtensions><!-- STRING: extension for header/include e.g. .h --></HeaderExtensions>
+			<SourceExtensions><!-- STRING: extension for source e.g. .cpp --></SourceExtensions>
+		</Extensions>
+
 	</source>
 </config>
diff --git a/src/lib/Project.cpp b/src/lib/Project.cpp
index 75fa16ae..2a6753f8 100644
--- a/src/lib/Project.cpp
+++ b/src/lib/Project.cpp
@@ -86,13 +86,8 @@ void Project::parseCode()
 	// TODO: move this creation to another place (after projectsettings have been loaded)
 	if (!m_fileManager)
 	{
-		std::vector<std::string> sourceExtensions;
-		sourceExtensions.push_back(".cpp");
-		sourceExtensions.push_back(".cc");
-
-		std::vector<std::string> includeExtensions;
-		includeExtensions.push_back(".h");
-		includeExtensions.push_back(".hpp");
+		std::vector<std::string> sourceExtensions = ProjectSettings::getInstance()->getSourceExtensions();
+		std::vector<std::string> includeExtensions = ProjectSettings::getInstance()->getHeaderExtensions();
 
 		m_fileManager = std::make_shared<FileManager>(sourcePaths, includePaths, sourceExtensions, includeExtensions);
 	}
diff --git a/src/lib/component/controller/SearchController.cpp b/src/lib/component/controller/SearchController.cpp
index 69e9c9ac..b031054d 100644
--- a/src/lib/component/controller/SearchController.cpp
+++ b/src/lib/component/controller/SearchController.cpp
@@ -1,7 +1,7 @@
 #include "component/controller/SearchController.h"
 
 #include "component/view/SearchView.h"
-#include "data/access/storageAccess.h"
+#include "data/access/StorageAccess.h"
 
 SearchController::SearchController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)
diff --git a/src/lib/settings/ProjectSettings.cpp b/src/lib/settings/ProjectSettings.cpp
index 3ecc51c1..43e1e9d8 100644
--- a/src/lib/settings/ProjectSettings.cpp
+++ b/src/lib/settings/ProjectSettings.cpp
@@ -30,3 +30,15 @@ bool ProjectSettings::setSourcePaths(const std::vector<std::string>& sourcePaths
 {
 	return setValues("source/SourcePaths/SourcePath", sourcePaths);
 }
+
+std::vector<std::string> ProjectSettings::getHeaderExtensions() const
+{
+	std::vector<std::string> defaultValues;
+	return getValues("source/Extensions/HeaderExtensions", defaultValues);
+}
+
+std::vector<std::string> ProjectSettings::getSourceExtensions() const
+{
+	std::vector<std::string> defaultValues;
+	return getValues("source/Extensions/SourceExtensions", defaultValues);
+}
\ No newline at end of file
diff --git a/src/lib/settings/ProjectSettings.h b/src/lib/settings/ProjectSettings.h
index 7820415f..f392bb5a 100644
--- a/src/lib/settings/ProjectSettings.h
+++ b/src/lib/settings/ProjectSettings.h
@@ -17,6 +17,10 @@ public:
 	std::vector<std::string> getSourcePaths() const;
 	bool setSourcePaths(const std::vector<std::string>& sourcePaths);
 
+	// extensions
+	std::vector<std::string> getHeaderExtensions() const;
+	std::vector<std::string> getSourceExtensions() const;
+
 private:
 	ProjectSettings();
 	ProjectSettings(const ProjectSettings&);