diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/ecam/cameraoverlay.h
--- a/epoc32/include/ecam/cameraoverlay.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/ecam/cameraoverlay.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,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.
@@ -13,8 +13,6 @@
 // Description:
 //
 
-
-
 /**
  @file
  @publishedAll
@@ -26,43 +24,13 @@
 
 #include <ecam.h>
 #include <ecam/ecamcommonuids.hrh>
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <ecam/cameraoverlayconst.h>
+#endif
 
 class MCameraOverlay;
 class MCameraOverlay2;
 
-/** 
-The current Version for the TOverlaySupportInfo class.
-@publishedPartner
-@prototype
-*/
-static const TUint KECamOverlaySupportInfoCurrentVersion = 1;
-
-/** 
-The current Version for the TOverlayParameters class.
-@publishedPartner
-@prototype
-*/
-static const TUint KECamOverlayParametersCurrentVersion = 1;
-
-/** 
-Constant used to specify that no specific viewfinder of the given type (either direct or client based) shall be considered.
-Rather, every viewfinder should be taken into consideration.
-@publishedPartner
-@prototype
-*/
-static const TInt  KECamOverlayNoSpecificViewFinderHandle = -1;
-
-/**
-Special handle value used for TOverlaySupportInfo::iViewFinderHandle when TOverlaySupportInfo::iDesiredCameraMode is other
-than viewfinder mode but not EModeNone.
-If TOverlaySupportInfo::iDesiredCameraMode is EModeNone, this indicates that OverlaySupportInfo should be used 
-as default, where support information was being provided to the client without distinguishing between different camera modes.
-Also used as default value for TOverlayParameters::iViewFinderHandle, when TOverlayParameters::iCurrentModes is not 
-neglected.
-@publishedPartner
-@prototype
-*/
-static const TInt  KECamOverlayInvalidViewFinderHandle = -2;
 
 /** 
 This is the UID which is used to obtain the CCameraOverlay interface,