diff --git a/OsmAnd/OsmAnd.iml b/OsmAnd/OsmAnd.iml
index f65424b6ed..d3c5532245 100644
--- a/OsmAnd/OsmAnd.iml
+++ b/OsmAnd/OsmAnd.iml
@@ -2,6 +2,7 @@
 <module type="JAVA_MODULE" version="4">
   <component name="EclipseModuleManager" forced_jdk="true">
     <varelement var="file://$OSMAND_TRUNK$/OsmAnd-java/src" value="linksrc:use" />
+    <varelement var="file://$OSMAND_TRUNK$/OsmAnd-java/src" kind="linksrc:" value="use" />
     <conelement value="com.android.ide.eclipse.adt.DEPENDENCIES" />
     <src_description expected_position="1">
       <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
@@ -25,7 +26,19 @@
     </content>
     <orderEntry type="jdk" jdkName="Android 4.1.2 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="com.android.ide.eclipse.adt.DEPENDENCIES" level="application" />
     <orderEntry type="module" module-name="SherlockBar" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$OSMAND_TRUNK$/OsmAnd-java/OsmAnd-core-android.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$OSMAND_TRUNK$/OsmAnd-java/OsmAnd-core-android.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -39,17 +52,6 @@
         <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" type="SOURCES" />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$OSMAND_TRUNK$/OsmAnd-java/OsmAnd-core.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$OSMAND_TRUNK$/OsmAnd-java/OsmAnd-core.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
   </component>
 </module>
 
diff --git a/SherlockBar/SherlockBar.iml b/SherlockBar/SherlockBar.iml
index b8800f7b15..839e8cb99a 100644
--- a/SherlockBar/SherlockBar.iml
+++ b/SherlockBar/SherlockBar.iml
@@ -25,15 +25,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android 4.1.2 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../android-sdk-linux/extras/android/support/v4/android-support-v4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" exported="" name="com.android.ide.eclipse.adt.DEPENDENCIES" level="application" />
   </component>
 </module>
 
diff --git a/plugins/OsmAnd-AddressPlugin/OsmAnd-AddressPlugin.iml b/plugins/OsmAnd-AddressPlugin/OsmAnd-AddressPlugin.iml
index fcb91eb6fe..4d1bed3008 100644
--- a/plugins/OsmAnd-AddressPlugin/OsmAnd-AddressPlugin.iml
+++ b/plugins/OsmAnd-AddressPlugin/OsmAnd-AddressPlugin.iml
@@ -23,6 +23,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android 4.1.2 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="com.android.ide.eclipse.adt.DEPENDENCIES" level="application" />
   </component>
 </module>
 
diff --git a/plugins/Osmand-ParkingPlugin/Osmand-ParkingPlugin.iml b/plugins/Osmand-ParkingPlugin/Osmand-ParkingPlugin.iml
index fcb91eb6fe..66a878fcb5 100644
--- a/plugins/Osmand-ParkingPlugin/Osmand-ParkingPlugin.iml
+++ b/plugins/Osmand-ParkingPlugin/Osmand-ParkingPlugin.iml
@@ -23,6 +23,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android 4.1.2 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="com.android.ide.eclipse.adt.DEPENDENCIES" level="application" />
   </component>
 </module>
 
diff --git a/plugins/Osmand-SRTMPlugin/Osmand-SRTMPlugin.iml b/plugins/Osmand-SRTMPlugin/Osmand-SRTMPlugin.iml
index fcb91eb6fe..4d1bed3008 100644
--- a/plugins/Osmand-SRTMPlugin/Osmand-SRTMPlugin.iml
+++ b/plugins/Osmand-SRTMPlugin/Osmand-SRTMPlugin.iml
@@ -23,6 +23,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android 4.1.2 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="com.android.ide.eclipse.adt.DEPENDENCIES" level="application" />
   </component>
 </module>