--- a/localisation/apparchitecture/tef/tssaac/tssaac_tapp.cpp	Wed Jul 28 16:03:37 2010 +0100
+++ b/localisation/apparchitecture/tef/tssaac/tssaac_tapp.cpp	Tue Aug 03 10:20:34 2010 +0100
@@ -1,7 +1,7 @@
 // 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"
+// 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".
 //
@@ -14,12 +14,11 @@
 // This is a Startup State Aware (SSA) test application used to
 // test apparc StartApp and StartDocument functionality.
 // 
+// tssaac_tapp.cpp
 //
 
-
-
 /**
- @file
+ @file tssaac_tapp.cpp
  @test
  @internalComponent  Internal Symbian test code
 */
@@ -32,9 +31,9 @@
 #include <eikappui.h>
 #include <eikapp.h>
 #include <eikdoc.h>
-#include <eikmenup.h>
+#include <mw/eikmenup.h>
 
-#include <eikon.hrh>
+#include <mw/eikon.hrh>
 
 #include <tssaac_tapp.rsg>
 
@@ -42,16 +41,16 @@
 #include <s32file.h>
 #include "tssaac.h"
 #include <apacmdln.h>
-#include "appfwk_test_AppUi.h"
+#include "appfwk_test_appui.h"
 #include "tstapp.h"
 
 
 
-////////////////////////////////////////////////////////////////////////
+//
 //
 // CExampleAppView
 //
-////////////////////////////////////////////////////////////////////////
+//
 class CExampleAppView : public CCoeControl
     {
 public:
@@ -108,11 +107,11 @@
 	}
 
 
-////////////////////////////////////////////////////////////////////////
+//
 //
 // CExampleAppUi
 //
-////////////////////////////////////////////////////////////////////////
+//
 class CExampleAppUi : public CEikAppUi
     {
 public:
@@ -148,11 +147,11 @@
 
 
 
-////////////////////////////////////////////////////////////////////////
+//
 //
 // CExampleDocument
 //
-////////////////////////////////////////////////////////////////////////
+//
 class CExampleDocument : public CEikDocument
 	{
 public:
@@ -174,11 +173,11 @@
 	}
 
 
-////////////////////////////////////////////////////////////////////////
+//
 //
 // CSysatartApparc
 //
-////////////////////////////////////////////////////////////////////////
+//
 
 class CSysatartApparc : public CEikApplication
 	{