diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
index bcbdbfa5e..e00a4a4c7 100644
--- a/gui/projectfile.cpp
+++ b/gui/projectfile.cpp
@@ -144,56 +144,6 @@ bool ProjectFile::Read(const QString &filename)
         return false;
 }
 
-QStringList ProjectFile::GetIncludeDirs() const
-{
-    QStringList dirs;
-    foreach (QString path, mIncludeDirs) {
-        dirs << QDir::fromNativeSeparators(path);
-    }
-    return dirs;
-}
-
-QStringList ProjectFile::GetDefines() const
-{
-    return mDefines;
-}
-
-QStringList ProjectFile::GetCheckPaths() const
-{
-    QStringList paths;
-    foreach (QString path, mPaths) {
-        paths << QDir::fromNativeSeparators(path);
-    }
-    return paths;
-}
-
-QStringList ProjectFile::GetExcludedPaths() const
-{
-    QStringList paths;
-    foreach (QString path, mExcludedPaths) {
-        paths << QDir::fromNativeSeparators(path);
-    }
-    return paths;
-}
-
-QStringList ProjectFile::GetLibraries() const
-{
-    QStringList libraries;
-    foreach (QString library, mLibraries) {
-        libraries << library;
-    }
-    return libraries;
-}
-
-QStringList ProjectFile::GetSuppressions() const
-{
-    QStringList suppressions;
-    foreach (QString suppression, mSuppressions) {
-        suppressions << suppression;
-    }
-    return suppressions;
-}
-
 void ProjectFile::ReadRootPath(QXmlStreamReader &reader)
 {
     QXmlStreamAttributes attribs = reader.attributes();
@@ -550,3 +500,11 @@ void ProjectFile::WriteStringList(QXmlStreamWriter &xmlWriter, const QStringList
     }
     xmlWriter.writeEndElement();
 }
+
+QStringList ProjectFile::fromNativeSeparators(const QStringList &paths)
+{
+    QStringList ret;
+    foreach (const QString &path, paths)
+        ret << QDir::fromNativeSeparators(path);
+    return ret;
+}
diff --git a/gui/projectfile.h b/gui/projectfile.h
index fe1f09401..0b9a162b2 100644
--- a/gui/projectfile.h
+++ b/gui/projectfile.h
@@ -41,15 +41,15 @@ public:
     ProjectFile(const QString &filename, QObject *parent = 0);
 
     /**
-    * @brief Read the project file.
-    * @param filename Filename (can be also given to constructor).
-    */
+     * @brief Read the project file.
+     * @param filename Filename (can be also given to constructor).
+     */
     bool Read(const QString &filename = QString());
 
     /**
-    * @brief Get project root path.
-    * @return project root path.
-    */
+     * @brief Get project root path.
+     * @return project root path.
+     */
     QString GetRootPath() const {
         return mRootPath;
     }
@@ -62,37 +62,49 @@ public:
     * @brief Get list of include directories.
     * @return list of directories.
     */
-    QStringList GetIncludeDirs() const;
+    QStringList GetIncludeDirs() const {
+        return ProjectFile::fromNativeSeparators(mIncludeDirs);
+    }
 
     /**
     * @brief Get list of defines.
     * @return list of defines.
     */
-    QStringList GetDefines() const;
+    QStringList GetDefines() const {
+        return mDefines;
+    }
 
     /**
     * @brief Get list of paths to check.
     * @return list of paths.
     */
-    QStringList GetCheckPaths() const;
+    QStringList GetCheckPaths() const {
+        return ProjectFile::fromNativeSeparators(mPaths);
+    }
 
     /**
     * @brief Get list of paths to exclude from the check.
     * @return list of paths.
     */
-    QStringList GetExcludedPaths() const;
+    QStringList GetExcludedPaths() const {
+        return ProjectFile::fromNativeSeparators(mExcludedPaths);
+    }
 
     /**
     * @brief Get list libraries.
     * @return list of libraries.
     */
-    QStringList GetLibraries() const;
+    QStringList GetLibraries() const {
+        return mLibraries;
+    }
 
     /**
     * @brief Get list suppressions.
     * @return list of suppressions.
     */
-    QStringList GetSuppressions() const;
+    QStringList GetSuppressions() const {
+        return mSuppressions;
+    }
 
     /**
     * @brief Get filename for the project file.
@@ -115,45 +127,45 @@ public:
     }
 
     /**
-    * @brief Set list of includes.
-    * @param includes List of defines.
-    */
+     * @brief Set list of includes.
+     * @param includes List of defines.
+     */
     void SetIncludes(const QStringList &includes);
 
     /**
-    * @brief Set list of defines.
-    * @param defines List of defines.
-    */
+     * @brief Set list of defines.
+     * @param defines List of defines.
+     */
     void SetDefines(const QStringList &defines);
 
     /**
-    * @brief Set list of paths to check.
-    * @param paths List of paths.
-    */
+     * @brief Set list of paths to check.
+     * @param paths List of paths.
+     */
     void SetCheckPaths(const QStringList &paths);
 
     /**
-    * @brief Set list of paths to exclude from the check.
-    * @param paths List of paths.
-    */
+     * @brief Set list of paths to exclude from the check.
+     * @param paths List of paths.
+     */
     void SetExcludedPaths(const QStringList &paths);
 
     /**
-    * @brief Set list of libraries.
-    * @param libraries List of libraries.
-    */
+     * @brief Set list of libraries.
+     * @param libraries List of libraries.
+     */
     void SetLibraries(const QStringList &libraries);
 
     /**
-    * @brief Set list of suppressions.
-    * @param suppressions List of suppressions.
-    */
+     * @brief Set list of suppressions.
+     * @param suppressions List of suppressions.
+     */
     void SetSuppressions(const QStringList &suppressions);
 
     /**
-    * @brief Write project file (to disk).
-    * @param filename Filename to use.
-    */
+     * @brief Write project file (to disk).
+     * @param filename Filename to use.
+     */
     bool Write(const QString &filename = QString());
 
     /**
@@ -166,9 +178,9 @@ public:
     static void WriteStringList(QXmlStreamWriter &xmlWriter, const QStringList &stringlist, const char startelementname[], const char stringelementname[]);
 
     /**
-    * @brief Set filename for the project file.
-    * @param filename Filename to use.
-    */
+     * @brief Set filename for the project file.
+     * @param filename Filename to use.
+     */
     void SetFilename(const QString &filename) {
         mFilename = filename;
     }
@@ -176,89 +188,94 @@ public:
 protected:
 
     /**
-    * @brief Read optional root path from XML.
-    * @param reader XML stream reader.
-    */
+     * @brief Read optional root path from XML.
+     * @param reader XML stream reader.
+     */
     void ReadRootPath(QXmlStreamReader &reader);
 
     /**
-    * @brief Read importproject from XML.
-    * @param reader XML stream reader.
-    */
+     * @brief Read importproject from XML.
+     * @param reader XML stream reader.
+     */
     void ReadImportProject(QXmlStreamReader &reader);
 
     /**
-    * @brief Read list of include directories from XML.
-    * @param reader XML stream reader.
-    */
+     * @brief Read list of include directories from XML.
+     * @param reader XML stream reader.
+     */
     void ReadIncludeDirs(QXmlStreamReader &reader);
 
     /**
-    * @brief Read list of defines from XML.
-    * @param reader XML stream reader.
-    */
+     * @brief Read list of defines from XML.
+     * @param reader XML stream reader.
+     */
     void ReadDefines(QXmlStreamReader &reader);
 
     /**
-    * @brief Read list paths to check.
-    * @param reader XML stream reader.
-    */
+     * @brief Read list paths to check.
+     * @param reader XML stream reader.
+     */
     void ReadCheckPaths(QXmlStreamReader &reader);
 
     /**
-    * @brief Read lists of excluded paths.
-    * @param reader XML stream reader.
-    */
+     * @brief Read lists of excluded paths.
+     * @param reader XML stream reader.
+     */
     void ReadExcludes(QXmlStreamReader &reader);
 
     /**
-     * @brief Read string list
-     * @param stringlist   destination string list
-     * @param reader       XML stream reader
-     * @param elementname  elementname for each string
-     */
+      * @brief Read string list
+      * @param stringlist   destination string list
+      * @param reader       XML stream reader
+      * @param elementname  elementname for each string
+      */
     void ReadStringList(QStringList &stringlist, QXmlStreamReader &reader, const char elementname[]);
 
 private:
 
     /**
-    * @brief Filename (+path) of the project file.
-    */
+     * @brief Convert paths
+     */
+    static QStringList fromNativeSeparators(const QStringList &paths);
+
+    /**
+     * @brief Filename (+path) of the project file.
+     */
     QString mFilename;
 
     /**
-    * @brief Root path (optional) for the project.
-    * This is the project root path. If it is present then all relative paths in
-    * the project file are relative to this path. Otherwise paths are relative
-    * to project file's path.
-    */
+     * @brief Root path (optional) for the project.
+     * This is the project root path. If it is present then all relative paths in
+     * the project file are relative to this path. Otherwise paths are relative
+     * to project file's path.
+     */
     QString mRootPath;
 
     QString mImportProject;
 
     /**
-    * @brief List of include directories used to search include files.
-    */
+     * @brief List of include directories used to search include files.
+     */
     QStringList mIncludeDirs;
 
     /**
-    * @brief List of defines.
-    */
+     * @brief List of defines.
+     */
     QStringList mDefines;
 
     /**
-    * @brief List of paths to check.
-    */
+     * @brief List of paths to check.
+     */
     QStringList mPaths;
 
     /**
-    * @brief Paths excluded from the check.
-    */
+     * @brief Paths excluded from the check.
+     */
     QStringList mExcludedPaths;
 
     /**
-    * @brief List of libraries.
-    */
+     * @brief List of libraries.
+     */
     QStringList mLibraries;
 
     /**