--- a/javauis/amms_akn/build/javaamms.pro	Wed Sep 15 12:05:25 2010 +0300
+++ b/javauis/amms_akn/build/javaamms.pro	Wed Oct 13 14:23:59 2010 +0300
@@ -26,14 +26,17 @@
 DEFINES += __JAVA_JSR234_TUNER
 
 
-INCLUDEPATH +=  ../ammscontrol/inc \
+INCLUDEPATH +=  /epoc32/include/mmf/common \
+                /epoc32/include/caf \
+                ../ammscontrol/inc \
                 ../ammscontrol/audio3D/inc \
                 ../ammscontrol/audioeffect/inc \
                 ../mmacontrol/inc \
                 ../module/inc \
                 ../src_tuner/native/external_include \
                 ../src_tuner/native/inc \
-                ../ammscontrol/inc 
+                ../ammscontrol/inc \
+                ../../mmapi_akn/baseline/inc
 
 
 SOURCES +=  ../ammscontrol/src/*.cpp \
@@ -44,7 +47,8 @@
             ../module/src/*.cpp
           
 contains(PROJECT_DEFINES,RD_JAVA_HTTP_EMC_ENABLED) {
-        INCLUDEPATH +=  ../mmacontrol/inc.emc \
+        INCLUDEPATH +=  ../../mmapi_akn/baseline/inc.emc \
+        ../mmacontrol/inc.emc \
         
         SOURCES += ../mmacontrol/src.emc/*.cpp
          
@@ -53,24 +57,33 @@
         -lmmfdevsound
 }
 else{
-			 INCLUDEPATH += ../mmacontrol/inc.mmf \
+			 INCLUDEPATH +=  ../../mmapi_akn/baseline/inc.mmf \
+        ../mmacontrol/inc.mmf \
         
 			  SOURCES += ../mmacontrol/src.mmf/*.cpp
 			  
 }
 
+contains(PROJECT_DEFINES,RD_JAVA_NGA_ENABLED) {
+				INCLUDEPATH +=  ../../mmapi_akn/baseline/inc.nga
+}
+else {
+				INCLUDEPATH +=  ../../mmapi_akn/baseline/inc.dsa
+}
+
+
 LIBS += -lAudioEqualizerEffect \
         -lAudioEqualizerUtility \
         -lCustomCommandUtility \
         -lDistanceAttenuationEffect \
-        -lDopplerbase \
+        -lDopplerBase \
         -lEnvironmentalReverbEffect \
         -lEnvironmentalReverbUtility \
         -lListenerDopplerEffect \
         -lListenerLocationEffect \
         -lListenerOrientationEffect \
         -lLocationBase \
-        -lmediaclientaudio \
+        -lMediaClientAudio \
         -lOrientationBase \
         -lRoomLevelEffect \
         -lSourceDopplerEffect \