diff --git a/lib/path.cpp b/lib/path.cpp
index f31bfd665..f1c26aec0 100644
--- a/lib/path.cpp
+++ b/lib/path.cpp
@@ -96,7 +96,7 @@ std::string Path::simplifyPath(const char *originalPath)
 
 bool Path::sameFileName(const std::string &fname1, const std::string &fname2)
 {
-#if defined(__linux__) || defined(__sun)
+#if defined(__linux__) || defined(__sun) || defined(__hpux)
     return bool(fname1 == fname2);
 #elif defined(__GNUC__)
     return bool(strcasecmp(fname1.c_str(), fname2.c_str()) == 0);
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 1450e335e..e2732fa99 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -686,7 +686,7 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
 
     // create variable symbol table
     _variableList.resize(_tokenizer->varIdCount() + 1);
-    fill_n(_variableList.begin(), _variableList.size(), (const Variable*)NULL);
+    std::fill_n(_variableList.begin(), _variableList.size(), (const Variable*)NULL);
 
     // check all scopes for variables
     for (it = scopeList.begin(); it != scopeList.end(); ++it) {
diff --git a/lib/tokenize.h b/lib/tokenize.h
index 848edf31f..f7dad0fe1 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -27,6 +27,7 @@
 #include <list>
 #include <vector>
 #include <set>
+#include <iosfwd>
 
 class Token;
 class ErrorLogger;