--- a/browserutilities/group/bld.inf	Wed Oct 13 15:46:58 2010 +0300
+++ b/browserutilities/group/bld.inf	Mon Nov 15 14:53:34 2010 +0000
@@ -24,9 +24,7 @@
 #include "../browsertelservice/group/bld.inf"
 #include "../favouritesengine/group/bld.inf"
 #include "../feedsengine/group/bld.inf"
-#ifdef BRDO_MULTIPART_PARSER_FF
 #include "../multipartparser/group/bld.inf"
-#endif
 #include "../schemehandler/group/bld.inf"
 #include "../webutils/group/bld.inf"
 #include "../aiwbrowserprovider/group/bld.inf"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/codhandler/Loc/bld.inf	Mon Nov 15 14:53:34 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*      Build information.
+*      
+*
+*/
+
+#include <platform_paths.hrh>
+#include "../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
+
+PRJ_EXPORTS
+../loc/codviewer.loc  				MW_LAYER_LOC_EXPORT_PATH(codviewer.loc)
+

--- a/codhandler/group/bld.inf	Wed Oct 13 15:46:58 2010 +0300
+++ b/codhandler/group/bld.inf	Mon Nov 15 14:53:34 2010 +0000
@@ -21,11 +21,6 @@
 //#include <data_caging_paths_strings.hrh>
 #include "../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
-PRJ_EXPORTS
-../loc/codviewer.loc  				MW_LAYER_LOC_EXPORT_PATH(codviewer.loc)
-../rom/CodHandler.iby				CORE_MW_LAYER_IBY_EXPORT_PATH(CodHandler.iby)
-../rom/CodHandlerResources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(CodHandlerResources.iby)
-
 #include "../codeng/group/bld.inf"
 #include "../codui/group/bld.inf"
 #include "../codrecog/group/bld.inf"
@@ -34,3 +29,7 @@
 #include "../ddviewer/group/bld.inf"
 #include "../coddownload/group/bld.inf"
 #include "../roapapp/group/bld.inf"
+
+#include "../Loc/bld.inf"
+#include "../rom/bld.inf"
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/codhandler/rom/bld.inf	Mon Nov 15 14:53:34 2010 +0000
@@ -0,0 +1,24 @@
+/*
+* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*      Build information.
+*/
+
+#include <platform_paths.hrh>
+#include "../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
+
+PRJ_EXPORTS
+../rom/CodHandler.iby				CORE_MW_LAYER_IBY_EXPORT_PATH(CodHandler.iby)
+../rom/CodHandlerResources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(CodHandlerResources.iby)
+