--- a/omap3530/beagle_drivers/hal/hal.mmp	Wed Mar 03 13:10:32 2010 +0000
+++ b/omap3530/beagle_drivers/hal/hal.mmp	Wed Mar 10 18:22:20 2010 +0000
@@ -24,6 +24,7 @@
 source			hal_main.cpp userhal.cpp
 
 systeminclude		+/include ../../../../../../../sf/os/kernelhwsrv/halservices/hal/inc
+OS_LAYER_SYSTEMINCLUDE
 sourcepath		+/build/generatedcpp/hal
 source			VariantTarget(values,cpp) VariantTarget(config,cpp)
 

--- a/omap3530/beagle_drivers/keytran/keymap.mmp	Wed Mar 03 13:10:32 2010 +0000
+++ b/omap3530/beagle_drivers/keytran/keymap.mmp	Wed Mar 10 18:22:20 2010 +0000
@@ -30,6 +30,7 @@
 linkas				ekdata.dll
 
 systeminclude		+/include
+OS_LAYER_SYSTEMINCLUDE
 
 sourcepath			.
 source				keymap.cpp

--- a/omap3530/beagle_drivers/serialmouse/serialmouse.mmh	Wed Mar 03 13:10:32 2010 +0000
+++ b/omap3530/beagle_drivers/serialmouse/serialmouse.mmh	Wed Mar 10 18:22:20 2010 +0000
@@ -22,9 +22,11 @@
 library				VariantTarget(ecust,lib)
 library				AsspTarget(kaomap3530,lib)
 library				AsspTarget(uart,lib)
+library				AsspTarget(prcm,lib)
 //library				resman.lib
 
 systeminclude		+/include/drivers
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 
 targettype			kext
 

--- a/omap3530/beagle_drivers/soundsc/soundsc.mmp	Wed Mar 03 13:10:32 2010 +0000
+++ b/omap3530/beagle_drivers/soundsc/soundsc.mmp	Wed Mar 10 18:22:20 2010 +0000
@@ -19,6 +19,7 @@
 #include			"kernel/kern_ext.mmh"
 
 SYSTEMINCLUDE		/epoc32/include/drivers
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 
 
 TARGET			VariantTarget(soundsc,pdd)

--- a/omap3530/beagle_drivers/usbv/usbv.mmp	Wed Mar 03 13:10:32 2010 +0000
+++ b/omap3530/beagle_drivers/usbv/usbv.mmp	Wed Mar 10 18:22:20 2010 +0000
@@ -23,6 +23,7 @@
 noexportlibrary
 
 systeminclude			+/include/drivers
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 
 sourcepath			.
 source				usbv.cpp

--- a/omap3530/beagleboard/src/vbeagle.mmp	Wed Mar 03 13:10:32 2010 +0000
+++ b/omap3530/beagleboard/src/vbeagle.mmp	Wed Mar 10 18:22:20 2010 +0000
@@ -31,6 +31,7 @@
 linkas				ecust.dll
 
 systeminclude		+/include/drivers
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 
 sourcepath			.
 source				variant.cpp

--- a/omap3530/omap3530_drivers/i2c/i2c.mmp	Wed Mar 03 13:10:32 2010 +0000
+++ b/omap3530/omap3530_drivers/i2c/i2c.mmp	Wed Mar 10 18:22:20 2010 +0000
@@ -29,6 +29,8 @@
 USERINCLUDE      .
 SYSTEMINCLUDE    +\include\assp\omap3530_assp 
 SYSTEMINCLUDE 	 +\include\drivers 
+SYMBIAN_BASE_SYSTEMINCLUDE(assp/omap3530_assp)
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 
 LIBRARY          AsspTarget(kaomap3530,lib)
 //library				resman.lib

--- a/omap3530/omap3530_drivers/usbcc/usbcc.mmp	Wed Mar 03 13:10:32 2010 +0000
+++ b/omap3530/omap3530_drivers/usbcc/usbcc.mmp	Wed Mar 10 18:22:20 2010 +0000
@@ -19,6 +19,7 @@
 
 systeminclude		+/include/drivers
 systeminclude		+/include/assp/omap3530_assp
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 
 target				AsspTarget(usbcc,dll)
 targettype			kext

--- a/omap3530/shared/monitor/monitor.mmp	Wed Mar 03 13:10:32 2010 +0000
+++ b/omap3530/shared/monitor/monitor.mmp	Wed Mar 10 18:22:20 2010 +0000
@@ -24,6 +24,7 @@
 target				AsspTarget(exmondebug,dll)
 
 systeminclude			+/include
+OS_LAYER_SYSTEMINCLUDE
 sourcepath			.
 source				monitor.cpp
 

--- a/omap3530/shared/serialkeyb/serialkeyboard.mmp	Wed Mar 03 13:10:32 2010 +0000
+++ b/omap3530/shared/serialkeyb/serialkeyboard.mmp	Wed Mar 10 18:22:20 2010 +0000
@@ -33,10 +33,12 @@
 
 systeminclude			+/include/drivers
 
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 sourcepath			.
 source				serialkeyboard.cpp
 
 library				AsspTarget(uart,lib)
+library				AsspTarget(prcm,lib)
 //library				resman.lib
 
 noexportlibrary