diff -r ff5437e4337c -r 48e57fb1237e userlibandfileserver/fileserver/smassstorage/smassstorage.mmh
--- a/userlibandfileserver/fileserver/smassstorage/smassstorage.mmh	Wed Oct 06 17:13:14 2010 +0100
+++ b/userlibandfileserver/fileserver/smassstorage/smassstorage.mmh	Mon Oct 11 17:54:41 2010 +0100
@@ -20,9 +20,11 @@
  @file
 */
 
-TARGETTYPE		fsy
+TARGETTYPE	fsy
 
 USERINCLUDE	../inc
+USERINCLUDE	traces
+
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
 SYSTEMINCLUDE	../inc
 SYMBIAN_BASE_SYSTEMINCLUDE(kernel)
@@ -32,12 +34,17 @@
 SOURCEPATH	../smassstorage
 SOURCE		scsiprot.cpp
 SOURCE		cbulkonlytransport.cpp
+
+// Double Buffering media interface
 SOURCE		cbulkonlytransportusbcldd.cpp
+SOURCE		tbulkmm.cpp
+SOURCE		rwdrivethread.cpp
+// Shared Chunk media interface
 #if !defined(WINS) && !defined(GENERIC_X86)
 SOURCE		cbulkonlytransportusbcscldd.cpp
 #endif
+
 SOURCE		cactivedevicestatenotifierbase.cpp
-SOURCE		rwdrivethread.cpp
 SOURCE		cmassstoragefilesystem.cpp
 SOURCE		cmassstoragemountcb.cpp
 SOURCE		cusbmassstoragecontroller.cpp
@@ -47,20 +54,22 @@
 SOURCE		drivepublisher.cpp
 
 LIBRARY		efile.lib efsrv.lib euser.lib 
+
+// Shared Chunk library
 #if !defined(WINS) && !defined(GENERIC_X86)
 LIBRARY	usbcsc_bil.lib
 #endif
 
 
 SOURCEPATH	.
-DOCUMENT		 ../group/release.txt
+DOCUMENT	../group/release.txt
 
 
 START WINS
-BASEADDRESS		0x61000000 
+BASEADDRESS	0x61000000 
 END
 
-UID		0 0x100000d6   //TODO reserve new UID
+UID	0 0x100000d6   //TODO reserve new UID
 
 unpaged