--- a/epoc32/include/mw/siprequestelements.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mw/siprequestelements.h	Wed Mar 31 12:33:34 2010 +0100
@@ -2,9 +2,9 @@
 * 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 "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.
@@ -29,7 +29,6 @@
 #include <s32strm.h>
 #include <stringpool.h>
 #include <uri8.h>
-#include "_sipcodecdefs.h"
 
 // FORWARD DECLARATIONS
 class CSIPMessageElements;
@@ -173,7 +172,9 @@
         CSIPMessageElements* iMessageElements;
 
     private: // For testing purposes
-        UNIT_TEST(CSIPRequestElementsTest)
+#ifdef CPPUNIT_TEST
+        friend class CSIPRequestElementsTest;
+#endif
     };
 
 #endif