--- a/idlehomescreen/group/bld.inf	Mon Nov 15 11:25:21 2010 +0000
+++ b/idlehomescreen/group/bld.inf	Mon Nov 15 11:41:52 2010 +0000
@@ -35,14 +35,6 @@
 //  Help exports
 #include "../help/group/bld.inf"
 
-PRJ_EXPORTS
-../loc/activeidle3.loc              APP_LAYER_LOC_EXPORT_PATH(activeidle3.loc)
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-
-PRJ_TESTEXPORTS
-
+#include "../loc/group/bld.inf"
 
 //  End of File  

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/loc/group/bld.inf	Mon Nov 15 11:41:52 2010 +0000
@@ -0,0 +1,21 @@
+/*
+* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "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 info file for Ado domain uishellservices
+*
+*/
+
+PRJ_EXPORTS
+../loc/activeidle3.loc              APP_LAYER_LOC_EXPORT_PATH(activeidle3.loc)
+
+

--- a/menufw/group/bld.inf	Mon Nov 15 11:25:21 2010 +0000
+++ b/menufw/group/bld.inf	Mon Nov 15 11:41:52 2010 +0000
@@ -22,21 +22,3 @@
 #include "../menufwui/group/bld.inf"
 #include "../menusuites/group/bld.inf"
 
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// ../rom/menufw_stub.iby	CORE_APP_LAYER_IBY_EXPORT_PATH(menufw_stub.iby)
-
-PRJ_MMPFILES
-#ifdef _MATRIX_MENU_INCLUDE_TEST_CONTENT
-#include "../sis/internal/tsrc/iad_testing/group/bld.inf"
-#endif
-
-PRJ_EXTENSIONS
-#ifndef _MATRIX_MENU_INCLUDE_TEST_CONTENT
-START EXTENSION app-services/buildstubsis
-OPTION SISNAME menufw_stub
-OPTION SRCDIR ../sis
-END
-#endif

--- a/menufw/menufwui/group/bld.inf	Mon Nov 15 11:25:21 2010 +0000
+++ b/menufw/menufwui/group/bld.inf	Mon Nov 15 11:41:52 2010 +0000
@@ -19,3 +19,23 @@
 #include "../mmextensions/group/bld.inf"
 #include "../mmwidgets/group/bld.inf"
 #include "../matrixmenu/group/bld.inf"
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+// ../../rom/menufw_stub.iby	CORE_APP_LAYER_IBY_EXPORT_PATH(menufw_stub.iby)
+
+PRJ_MMPFILES
+#ifdef _MATRIX_MENU_INCLUDE_TEST_CONTENT
+#include "../../sis/internal/tsrc/iad_testing/group/bld.inf"
+#endif
+
+PRJ_EXTENSIONS
+#ifndef _MATRIX_MENU_INCLUDE_TEST_CONTENT
+START EXTENSION app-services/buildstubsis
+OPTION SISNAME menufw_stub
+OPTION SRCDIR ../../sis
+END
+#endif