--- a/epoc32/include/mw/swi/pkgremover.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mw/swi/pkgremover.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,20 +1,20 @@
-// Copyright (c) 2007-2009 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 "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Interface class for listing/removing uninstalled packages from a removable drive
-// 
-//
-
+/*
+* Copyright (c) 2007-2009 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: 
+* Interface class for listing/removing uninstalled packages from a removable drive
+*
+*/
 
 
 /**
@@ -27,7 +27,7 @@
 #define __PKGREMOVER_H__
 
 #include <e32base.h>
-#include <f32fsys.h>
+#include <f32file.h>
 #include <s32mem.h>
 
 namespace Swi