--- a/localisation/apparchitecture/tef/T_ControlPanelTest.h	Wed Jul 28 16:03:37 2010 +0100
+++ b/localisation/apparchitecture/tef/T_ControlPanelTest.h	Tue Aug 03 10:20:34 2010 +0100
@@ -1,7 +1,7 @@
 // Copyright (c) 2005-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".
 //
@@ -11,12 +11,11 @@
 // Contributors:
 //
 // Description:
+// t_controlpaneltest.h
 //
 
-
-
 /**
- @file
+ @file t_controlpaneltest.h
  @internalComponent - Internal Symbian test code 
 */
  
@@ -26,23 +25,31 @@
 #ifndef		__T_CONTROLPANEL_STEP_H
 #define		__T_CONTROLPANEL_STEP_H
 
-#include "ApparcTestServer.h"
+#include "apparctestserver.h"
 
 #include <apaid.h>
-#include "..\apparc\apadll.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <apaidpartner.h>
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "../apparc/apadll.h"
 #include <apgaplst.h>
 #include <apgicnfl.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <apgicnflpartner.h>
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <apgdoor.h>
 #include <apfrec.h>
 #include <apfctlf.h>
 #include <apgctl.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <apgctllist.h>
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <apgaplst.h>
 #include <apaflrec.h>
 #include <apgcli.h>
 #include <apacmdln.h>
-#include <apsserv.h>
 #include "appfwk_test_utils.h"
-#include "..\apserv\apsclsv.h" // so I can start the server
+#include "../apserv/apsclsv.h" // so I can start the server
 
 
 _LIT(KT_ControlPanelTest, "T_ControlPanelTest");
@@ -94,3 +101,5 @@
 	};
 
 #endif
+
+