diff --git a/gui/gui.pro b/gui/gui.pro
index 563877892..0ea06ada8 100644
--- a/gui/gui.pro
+++ b/gui/gui.pro
@@ -152,10 +152,12 @@ SOURCES += aboutdialog.cpp \
     libraryeditargdialog.cpp
 
 win32 {
-    DEFINES += _CRT_SECURE_NO_WARNINGS
     RC_FILE = cppcheck-gui.rc
     HEADERS += ../lib/version.h
-    LIBS += -lshlwapi
+    contains(LINKCORE, [yY][eE][sS]) {
+    } else {
+        LIBS += -lshlwapi
+    }
 }
 
 contains(QMAKE_CC, gcc) {
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
index eecf7983f..2402770ed 100644
--- a/lib/errorlogger.h
+++ b/lib/errorlogger.h
@@ -192,9 +192,9 @@ public:
             std::string stringify() const;
 
             unsigned int line;
+
         private:
             std::string _file;
-
         };
 
         ErrorMessage(const std::list<FileLocation> &callStack, Severity::SeverityType severity, const std::string &msg, const std::string &id, bool inconclusive);