diff --git a/.gitignore b/.gitignore
index 766f586..c413908 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,9 @@ build/
 *.pyc
 .idea
 *.iml
+*.o
+Makefile
+.qmake.stash
 
 project.xcworkspace
 xcuserdata
@@ -19,6 +22,8 @@ data/thumb/
 data/index.dat
 data/header_images/
 
+env/env_tests
+
 builder/genindex/genindex
 
 builder/wikivoyage/*.redirect.txt
@@ -31,5 +36,3 @@ builder/wikivoyage/Countries
 
 # This is separate git repository with MWM API
 android/3rdparty/api-android
-builder/genindex/.qmake.stash
-builder/genindex/Makefile
\ No newline at end of file
diff --git a/env/file_system.cpp b/env/file_system.cpp
index 0446e93..3065b92 100644
--- a/env/file_system.cpp
+++ b/env/file_system.cpp
@@ -1,5 +1,5 @@
 #include "file_system.hpp"
-
+#include "../std/cstdio.hpp"
 
 namespace fs
 {
diff --git a/storage/article_info.cpp b/storage/article_info.cpp
index 251b73b..f29b5eb 100644
--- a/storage/article_info.cpp
+++ b/storage/article_info.cpp
@@ -13,7 +13,7 @@
 #include "../std/cmath.hpp"
 #include "../std/static_assert.hpp"
 #include "../std/array.hpp"
-
+#include "../std/cstring.hpp"
 
 namespace
 {
diff --git a/storage/article_info.hpp b/storage/article_info.hpp
index 478e288..a0b2f3f 100644
--- a/storage/article_info.hpp
+++ b/storage/article_info.hpp
@@ -2,7 +2,7 @@
 
 #include "../std/string.hpp"
 #include "../std/algorithm.hpp"
-
+#include "../std/stdint.hpp"
 
 namespace wr { class Writer; }
 namespace rd { class Reader; }
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 91782af..1982c81 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -7,7 +7,7 @@
 #include "../std/algorithm.hpp"
 #include "../std/utility.hpp"
 #include "../std/iterator.hpp"
-
+#include "../std/stdint.hpp"
 
 void Storage::Load(rd::Reader & reader)
 {
diff --git a/storage/storage_builder.hpp b/storage/storage_builder.hpp
index a3a41d4..7e988c8 100644
--- a/storage/storage_builder.hpp
+++ b/storage/storage_builder.hpp
@@ -4,7 +4,7 @@
 #include "article_info.hpp"
 
 #include "../std/map.hpp"
-
+#include "../std/stdint.hpp"
 
 class ArticleInfoBuilder : public ArticleInfo
 {