--- a/widgets/widgetlauncher/src/WidgetLauncher.cpp	Tue Aug 31 16:17:46 2010 +0300
+++ b/widgets/widgetlauncher/src/WidgetLauncher.cpp	Wed Sep 01 12:28:30 2010 +0100
@@ -21,18 +21,20 @@
 // INCLUDE FILES
 
 #include "widgetappdefs.rh"
-#include <apacmdln.h>
+#include <APACMDLN.H>
 #include <s32mem.h>
 #include <e32std.h>
 #include <e32base.h>
 #include <f32file.h>
 #include <apgcli.h>
-#include <w32std.h>
-#include <apgtask.h>
+#include <W32STD.H>
+#include <APGTASK.H>
 #include <oommonitorsession.h>
 #include <e32property.h>
+#ifndef BRDO_OOM_MONITOR2_COMPONENT_FF 
 #include <systemwarninglevels.hrh>
-#include "Browser_platform_variant.hrh"
+#endif
+#include "browser_platform_variant.hrh"
 
 // CONSTANTS
 #define KUidWidgetOOMPlugin 0x10282855
@@ -209,7 +211,7 @@
             TInt bytesAvailaible(0);
             if (aOperation != WidgetSelect && aOperation != LaunchFullscreen )
                 {
-#ifdef FF_OOM_MONITOR2_COMPONENT
+#ifdef BRDO_OOM_MONITOR2_COMPONENT_FF
                 err = monitorSession.RequestOptionalRam(KMemoryToLaunchWidgetUi, KMemoryToLaunchWidgetUi,KUidWidgetOOMPlugin, bytesAvailaible);
 #else
                    TMemoryInfoV1Buf info;