diff -r f9ce957a272c -r cdae8c6c3876 homescreenapp/hsdomainmodel/hsdomainmodel.pri
--- a/homescreenapp/hsdomainmodel/hsdomainmodel.pri	Fri Mar 19 09:27:44 2010 +0200
+++ b/homescreenapp/hsdomainmodel/hsdomainmodel.pri	Fri Apr 16 14:54:01 2010 +0300
@@ -13,48 +13,24 @@
 #
 # Description:
 #
-HEADERS +=  ./inc/hscontentservice.h \
-                       ./inc/hsdatabase.h  \ 
-                       ./inc/hsdomainmodel_global.h  \
-                       ./inc/hspage.h \  
-                        ./inc/hspagedata.h \  
-                        ./inc/hsscene.h \
-                        ./inc/hsscene_p.h \ 
-                        ./inc/hsscenedata.h \
-                        ./inc/hsshortcutservice.h \
-                         ./inc/hsshortcutservice_p.h \
-                         ./inc/hswallpaper.h \
-                        ./inc/hswallpaper_p.h \
-                        ./inc/hswidgetdata.h \                      
-                          ./inc/hswidgethost.h \  
-                           ./inc/hswidgetpresentationdata.h 
+
+HEADERS += ./inc/hscontentservice.h \
+           ./inc/hsdomainmodeldatastructures.h \
+           ./inc/hsdatabase.h  \                        
+           ./inc/hsdomainmodel_global.h  \
+           ./inc/hspage.h \  
+           ./inc/hsscene.h \
+           ./inc/hsshortcutservice.h \
+           ./inc/hsshortcutservice_p.h \
+           ./inc/hswallpaper.h \
+           ./inc/hswidgethost.h
                                
-SOURCES += ./src/hscontentservice.cpp   \
-                        ./src/hsdatabase.cpp  \
-                        ./src/hspage.cpp  \
-                        ./src/hspagedata.cpp  \
-                        ./src/hsscene.cpp \
-                        ./src/hsscenedata.cpp \
-                        ./src/hsshortcutservice.cpp \   
-                       ./src/hswallpaper.cpp \ 
-                       ./src/hswidgetdata.cpp \       
-                       ./src/hswidgethost.cpp \       
-                       ./src/hswidgetpresentationdata.cpp 
+SOURCES += ./src/hscontentservice.cpp   \           
+           ./src/hsdatabase.cpp  \                        
+           ./src/hspage.cpp  \
+           ./src/hsscene.cpp \                        
+           ./src/hsshortcutservice.cpp \   
+           ./src/hswallpaper.cpp \ 
+           ./src/hswidgethost.cpp
                               
-win32:{
-HEADERS +=  ./inc/hscontentpublishhandler.h \
-                        ./inc/hsipcchannel.h \
-                        ./inc/hsipcchannelclient.h \
-                        ./inc/hsipcchannelhost.h \
-                        ./inc/hsipcconnectiondispatcher.h \   
-                        ./inc/hsipcserver.h     
-                      
-SOURCES +=  ./src/hscontentpublishhandler.cpp \
-                        ./src/hsipcchannel.cpp \
-                        ./src/hsipcchannelclient.cpp \
-                        ./src/hsipcchannelhost.cpp \
-                        ./src/hsipcconnectiondispatcher.cpp \   
-                        ./src/hsipcserver.cpp 
 
-}
-