--- a/localisation/apparchitecture/inc/APACLN.H	Wed Jul 28 16:03:37 2010 +0100
+++ b/localisation/apparchitecture/inc/APACLN.H	Tue Aug 03 10:20:34 2010 +0100
@@ -1,7 +1,7 @@
 // Copyright (c) 1997-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"
+// 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".
 //
@@ -12,17 +12,15 @@
 //
 // Description:
 //
+// apacln.h
+//
 
 
-#if !defined(__APACLN_H__)
+#ifndef __APACLN_H__
 #define __APACLN_H__
 
-#if !defined(__APPARC_H__)
 #include <apparc.h>
-#endif
 
-
-class TApaDocCleanupItem
 /** Allows CApaDocument-derived objects to be safely put onto the cleanup 
 stack, by calling CApaProcess::DestroyDocument() should a leave or a call 
 to CleanupStack::PopAndDestroy() occur.
@@ -37,6 +35,7 @@
 @publishedPartner
 @deprecated
 */
+class TApaDocCleanupItem
 	{
 public:
 	inline TApaDocCleanupItem(CApaProcess* aProcess,CApaDocument* aDoc);
@@ -51,19 +50,19 @@
 	};
 
 
-inline TApaDocCleanupItem::TApaDocCleanupItem(CApaProcess* aProcess,CApaDocument* aDoc)
-	: iApaProcess(aProcess), iApaDoc(aDoc)
 /** Constructs a cleanup item object for the specified document.
 
 @param aProcess A pointer to the process object that will be used to destroy the document.
 @param aDoc The document to destroy as part of cleanup. */
+inline TApaDocCleanupItem::TApaDocCleanupItem(CApaProcess* aProcess,CApaDocument* aDoc)
+	: iApaProcess(aProcess), iApaDoc(aDoc)
 	{}
 
-inline TApaDocCleanupItem::operator TCleanupItem()
 /** A TCleanupItem cast operator that enables the TApaDocCleanupItem object to be pushed to 
 the cleanup stack as a TCleanupItem, so that the document will be properly destroyed 
 (by a call to CApaProcess::DestroyDocument()) should a leave or a call to 
 CleanupStack::PopAndDestroy() occur. */
+inline TApaDocCleanupItem::operator TCleanupItem()
 	{return TCleanupItem(DoCleanup,this);}
 
-#endif
+#endif	// __APACLN_H__