diff --git a/coding/internal/file_data.cpp b/coding/internal/file_data.cpp
index 316a399285..3c3fda6195 100644
--- a/coding/internal/file_data.cpp
+++ b/coding/internal/file_data.cpp
@@ -1,8 +1,8 @@
 #include "coding/internal/file_data.hpp"
 
-#include "reader.hpp" // For Reader exceptions.
-#include "writer.hpp" // For Writer exceptions.
 #include "coding/constants.hpp"
+#include "coding/reader.hpp" // For Reader exceptions.
+#include "coding/writer.hpp" // For Writer exceptions.
 
 #include "base/exception.hpp"
 #include "base/logging.hpp"
diff --git a/drape_frontend/animation/follow_animation.cpp b/drape_frontend/animation/follow_animation.cpp
index d8da05fe65..32d0f59205 100644
--- a/drape_frontend/animation/follow_animation.cpp
+++ b/drape_frontend/animation/follow_animation.cpp
@@ -1,7 +1,7 @@
 #include "follow_animation.hpp"
 
-#include "animation_constants.hpp"
-#include "animation_system.hpp"
+#include "drape_frontend/animation_constants.hpp"
+#include "drape_frontend/animation_system.hpp"
 
 #include "base/assert.hpp"
 #include "base/logging.hpp"
diff --git a/drape_frontend/animation/parallel_animation.cpp b/drape_frontend/animation/parallel_animation.cpp
index 3445933a66..22cdf386f7 100644
--- a/drape_frontend/animation/parallel_animation.cpp
+++ b/drape_frontend/animation/parallel_animation.cpp
@@ -1,6 +1,6 @@
 #include "parallel_animation.hpp"
 
-#include "animation_system.hpp"
+#include "drape_frontend/animation_system.hpp"
 
 namespace df
 {
diff --git a/drape_frontend/animation/scale_animation.cpp b/drape_frontend/animation/scale_animation.cpp
index 0ee6b12b0b..2fb91703b2 100644
--- a/drape_frontend/animation/scale_animation.cpp
+++ b/drape_frontend/animation/scale_animation.cpp
@@ -1,6 +1,6 @@
 #include "scale_animation.hpp"
 
-#include "animation_system.hpp"
+#include "drape_frontend/animation_system.hpp"
 
 #include "base/assert.hpp"
 
diff --git a/drape_frontend/animation/sequence_animation.cpp b/drape_frontend/animation/sequence_animation.cpp
index 4a2a121fa1..0928f76b1b 100644
--- a/drape_frontend/animation/sequence_animation.cpp
+++ b/drape_frontend/animation/sequence_animation.cpp
@@ -1,6 +1,6 @@
 #include "sequence_animation.hpp"
 
-#include "animation_system.hpp"
+#include "drape_frontend/animation_system.hpp"
 
 #include "base/assert.hpp"
 
diff --git a/xcode/fribidi/fribidi.xcodeproj/project.pbxproj b/xcode/fribidi/fribidi.xcodeproj/project.pbxproj
index 93866f6558..31cb670bbe 100644
--- a/xcode/fribidi/fribidi.xcodeproj/project.pbxproj
+++ b/xcode/fribidi/fribidi.xcodeproj/project.pbxproj
@@ -277,6 +277,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(OMIM_ROOT)/3party/fribidi",
+					"$(OMIM_ROOT)/3party/fribidi/lib",
 				);
 			};
 			name = Debug;
@@ -288,6 +289,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(OMIM_ROOT)/3party/fribidi",
+					"$(OMIM_ROOT)/3party/fribidi/lib",
 				);
 			};
 			name = Release;