diff --git a/README.md b/README.md
index e6b4761e..3208f006 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@
 
 * CXX_TEST_DIR - .../cxxtest-4.3
 * CLANG_DIR - .../clang-llvm
-* BOOST_DIR - .../boost_1_64_0
+* BOOST_DIR - .../boost_1_68_0
 * BOTAN_DIR - .../Botan-2.1.0
 
 For MacOS and Linux
diff --git a/src/lib/data/indexer/TaskBuildIndex.cpp b/src/lib/data/indexer/TaskBuildIndex.cpp
index 85b34e4e..42da6f00 100644
--- a/src/lib/data/indexer/TaskBuildIndex.cpp
+++ b/src/lib/data/indexer/TaskBuildIndex.cpp
@@ -31,11 +31,11 @@ TaskBuildIndex::TaskBuildIndex(
 	, m_appUUID(appUUID)
 	, m_multiProcessIndexing(multiProcessIndexing)
 	, m_interprocessIndexingStatusManager(appUUID, 0, true)
+	, m_indexerCommandQueueStopped(false)
 	, m_processCount(processCount)
 	, m_interrupted(false)
 	, m_indexingFileCount(0)
 	, m_runningThreadCount(0)
-	, m_indexerCommandQueueStopped(false)
 {
 }
 
diff --git a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h
index 076e1020..bcb46b86 100644
--- a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h
+++ b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <set>
+#include <string>
 #include <unordered_map>
 
 #include "data/indexer/IndexerCommandProvider.h"
diff --git a/src/lib_cxx/utility/IncludeProcessing.cpp b/src/lib_cxx/utility/IncludeProcessing.cpp
index 6b9672c8..4f39a54e 100644
--- a/src/lib_cxx/utility/IncludeProcessing.cpp
+++ b/src/lib_cxx/utility/IncludeProcessing.cpp
@@ -16,7 +16,7 @@ namespace
 {
 	struct IncludeDirectiveComparator
 	{
-		bool operator()(const IncludeDirective& a, const IncludeDirective& b)
+		bool operator()(const IncludeDirective& a, const IncludeDirective& b) const
 		{
 			return a.getIncludedFile() < b.getIncludedFile();
 		}