diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/a3f/a3f_trace_ctxt.h
--- a/epoc32/include/a3f/a3f_trace_ctxt.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/a3f/a3f_trace_ctxt.h	Wed Mar 31 12:33:34 2010 +0100
@@ -2,9 +2,9 @@
 * Copyright (c) 2004-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
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
@@ -20,26 +20,12 @@
 
 /**
  @file
- @internalTechnology 
+* @publishedAll
 */
 
 #ifndef _A3F_TRACE_CTXT_H_
 #define _A3F_TRACE_CTXT_H_
 
-// MACROS
-//#define DISABLE_SYNTAX_CHECK
-#define DISABLE_GROUP_CHECKS
-
-struct TTraceName
-    {
-    const TUint32 iId;
-    const TUint32 iGrpId;
-#ifdef __WINS__
-    const TText16* const iName;
-#else
-    const wchar_t* const iName;
-#endif
-    };
     
 /**
 @publishedAll
@@ -71,55 +57,9 @@
         CtxRadio
 };
 
-static const TTraceName TRACENFO[] = 
-    {
-        { CtxTest,           0x00000001, L"Test" },
-        { CtxDevSound,       0x00000002, L"DevSound" },
-        { CtxDsProxy,        0x00000004, L"DevSound proxy" },
-        { CtxDsStarter,      0x00000008, L"DevSound starter" },
-        { CtxDsServer,       0x00000010, L"DevSound server" },
-        { CtxDsdaptation,    0x00000020, L"DevSound adaptation" },
-        { CtxHwDevice,       0x00000040, L"HW device" },
-        { CtxPolicyProxy,    0x00000080, L"Policy proxy" },
-        { CtxPolicyServer,   0x00000100, L"Policy server" },
-        { CtxPolicyCtrl,     0x00000200, L"Policy control" },
-        { CtxMmRm,           0x00000400, L"Mm resource manager" },
-        { CtxAudioServer,    0x00000800, L"Audio server" },
-        { CtxAsProxy,        0x00001000, L"Audio server proxy" },
-        { CtxAsServer,       0x00002000, L"Audio server server" },
-        { CtxAsCtrl,         0x00004000, L"Audio server control" },
-        { CtxAsEap,          0x00008000, L"Audio server EAP" },
-        { CtxMdaif,          0x00010000, L"MDAIF" },
-        { CtxAaMm,           0x00020000, L"Message mapper" },
-        { CtxRadio,          0x00040000, L"Radio" }
-    };
-
-#define CtxDefaultGroups _CtxDefaultGroups()
-
-
-inline TInt _CtxDefaultGroups()
-	{
-        return TRACENFO[CtxTest].iGrpId         | 
-               TRACENFO[CtxDevSound].iGrpId     | 
-               TRACENFO[CtxDsProxy].iGrpId      | 
-               TRACENFO[CtxDsStarter].iGrpId    | 
-               TRACENFO[CtxDsServer].iGrpId     | 
-               TRACENFO[CtxDsdaptation].iGrpId  | 
-               TRACENFO[CtxHwDevice].iGrpId     | 
-               TRACENFO[CtxPolicyProxy].iGrpId  | 
-               TRACENFO[CtxPolicyServer].iGrpId | 
-               TRACENFO[CtxPolicyCtrl].iGrpId   | 
-               TRACENFO[CtxMmRm].iGrpId         | 
-               TRACENFO[CtxAudioServer].iGrpId  | 
-               TRACENFO[CtxAsProxy].iGrpId      | 
-               TRACENFO[CtxAsServer].iGrpId     | 
-               TRACENFO[CtxAsCtrl].iGrpId       | 
-               TRACENFO[CtxAsEap].iGrpId        | 
-               TRACENFO[CtxMdaif].iGrpId        | 
-               TRACENFO[CtxAaMm].iGrpId         | 
-               TRACENFO[CtxRadio].iGrpId;
-	}
-
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <a3f/a3f_trace_ctxt_def.h>
+#endif
 #endif  // _A3F_TRACE_CTXT_H_
             
 // End of File