--- a/Group/bld.inf	Wed Mar 03 15:01:24 2010 +0000
+++ b/Group/bld.inf	Fri Mar 05 09:11:09 2010 +0000
@@ -32,7 +32,7 @@
 //#include "../IM/group/bld.inf"
 //#include "../localisation/uiftestfw/group/BLD.INF"
 //#include "../localisation/apparchitecture/group/BLD.INF"
-//#include "../graphics/wserv/group/bld.inf"
+#include "../graphics/wserv/group/bld.inf"
 #include "../http/group/bld.inf"
 #include "../mediamgmt/group/Bld.inf"
 #include "../browser/group/Bld.inf"

--- a/email/email/smtp/group/T_SmtpServer.mmp	Wed Mar 03 15:01:24 2010 +0000
+++ b/email/email/smtp/group/T_SmtpServer.mmp	Fri Mar 05 09:11:09 2010 +0000
@@ -21,7 +21,7 @@
 	UID			0x1000007A 0x10274070
 	VENDORID 		0x70000001
 
-
+#include <platform_paths.hrh>
 // Include the Framework 
 #include "../../../framework/group/T_MsgFramework.mph"
 
@@ -29,6 +29,7 @@
 SYSTEMINCLUDE		/epoc32/include
 SYSTEMINCLUDE		/epoc32/include/test
 SYSTEMINCLUDE		/epoc32/include/comms-infras
+APP_LAYER_SYSTEMINCLUDE
 
 USERINCLUDE 	../inc
 

--- a/graphics/fbserv/inc/T_DataFbsBitmap.h	Wed Mar 03 15:01:24 2010 +0000
+++ b/graphics/fbserv/inc/T_DataFbsBitmap.h	Fri Mar 05 09:11:09 2010 +0000
@@ -33,6 +33,7 @@
 #include <fbs.h>
 #include <s32file.h>
 #include <bitdev.h>
+#include <bitmapuid.h>
 
 class CT_DataFbsBitmap : public CDataWrapperBase
 	{

--- a/graphics/fbserv/inc/T_DataFbsSession.h	Wed Mar 03 15:01:24 2010 +0000
+++ b/graphics/fbserv/inc/T_DataFbsSession.h	Fri Mar 05 09:11:09 2010 +0000
@@ -30,6 +30,7 @@
 //	EPOC includes
 #include <e32std.h>
 #include <fbs.h>
+#include <fbsmessage.h>
 
 class CT_DataFbsSession : public CDataWrapperBase
 	{