diff --git a/moses/src/DynSAInclude/file.h b/moses/src/DynSAInclude/file.h
index eae5ed8c6..a7466bfb9 100644
--- a/moses/src/DynSAInclude/file.h
+++ b/moses/src/DynSAInclude/file.h
@@ -1,5 +1,5 @@
-#ifndef moses_File_h
-#define moses_File_h
+#ifndef moses_DynSAInclude_File_h
+#define moses_DynSAInclude_File_h
 
 #include <iostream>
 #include <fstream>
@@ -14,6 +14,7 @@
 namespace Moses {
 typedef std::string FileExtension;
 
+
 class FileHandler: public std::fstream {
 public:
   // descriptors for stdin and stdout
diff --git a/moses/src/PhraseDictionaryDynSuffixArray.cpp b/moses/src/PhraseDictionaryDynSuffixArray.cpp
index 027064bb1..fc46e9905 100644
--- a/moses/src/PhraseDictionaryDynSuffixArray.cpp
+++ b/moses/src/PhraseDictionaryDynSuffixArray.cpp
@@ -5,6 +5,8 @@
 #include "TargetPhrase.h"
 #include <iomanip>
 
+using namespace std;
+
 namespace Moses {
 PhraseDictionaryDynSuffixArray::PhraseDictionaryDynSuffixArray(size_t numScoreComponent, 
   PhraseDictionaryFeature* feature): PhraseDictionary(numScoreComponent, feature), 
diff --git a/moses/src/PhraseDictionaryDynSuffixArray.h b/moses/src/PhraseDictionaryDynSuffixArray.h
index 38883a3fd..573aec5b3 100644
--- a/moses/src/PhraseDictionaryDynSuffixArray.h
+++ b/moses/src/PhraseDictionaryDynSuffixArray.h
@@ -1,6 +1,8 @@
 #ifndef moses_PhraseDictionaryDynSuffixArray_h
 #define moses_PhraseDictionaryDynSuffixArray_h
 
+#include <map>
+
 #include "PhraseDictionary.h"
 #include "DynSuffixArray.h" 
 #include "DynSAInclude/vocab.h"