--- a/epoc32/include/securesocket.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/securesocket.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 2001-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.
@@ -15,8 +15,6 @@
 // 
 //
 
-
-
 /**
  @file
 */
@@ -34,104 +32,12 @@
 #include <x509cert.h>
 
 #include <securesocketinterface.h>
-//Secure Socket specific panic
-_LIT(KSecureSocketPanic,"SecureSocket Panic");
-
-/** 
- * Maximum length of the protocol name. 
- * 
- * @internalComponent
- */
-const TInt KMaxProtocolName = 32;
-
-class TSecSocketProtocol
-/** 
- * The secure socket protocol class. 
- * 
- * @internalComponent
- *
- * @since v7.0 
- */
-	{
-public:
-	/** Protocol name. */
-	TBuf<KMaxProtocolName> iName;
-	/** Handle to the DLL. */
-	RLibrary iLibrary;
-	static inline TInt Offset()
-	/** 
-	* Gets the offset to the iSlink member.
-	* 
-	* @return The offset to the iSlink member. */
-		{return _FOFF(TSecSocketProtocol,iSlink);}
-	// Moved the implementation to the cpp file
-	virtual ~TSecSocketProtocol();
-private:
-    TSglQueLink   iSlink;
-	};
-
-
-class TSecureSocketGlobals
-/** 
- * Class to store the Secure Sockets Globals. 
- * 
- * @internalComponent
- * 
- * @since v7.0 
- */
-	{
-public:
-	inline TSecureSocketGlobals():
-			iSecureSocketProtocols(TSecSocketProtocol::Offset()),
-	/** Constructor. */
-			iSecureSocketProtocolsIter(iSecureSocketProtocols),
-			iUseCount(0){};	
-	/** List of supported protocols. */
-	TSglQue<TSecSocketProtocol> iSecureSocketProtocols;
-	/** A templated class that provides for iterating through the list of supported 
-	* protocols. */
-	TSglQueIter<TSecSocketProtocol> iSecureSocketProtocolsIter;
-	/** Use counter. */
-	TInt iUseCount;
-	};
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <securesocket_internal.h>
+#endif
 
 class MGenericSecureSocket;
 
-/** 
- * Definition for the entry point function exported by Secure Socket modules. 
- * 
- * @internalComponent
- */
-typedef TInt (*TSecSockDllLibraryFunction)( RSocket& aSocket, const TDesC& aProtocol );
-typedef TInt (*TSecSockDllLibraryGenericFunction)(MGenericSecureSocket& aSocket, const TDesC& aProtocol);
-
-/** 
- * Definition for the entry point for the cleanup function exported by secureSocket modules
- * 
- * @internalComponent
- */
-typedef void (*TSecSockDllUnloadFunction)( TAny* );
-
-class CSecureSocketLibraryLoader : public CBase
-/** 
- * Factory class for creating secure sockets. 
- * 
- * @internalAll
- *
- * @since v6.2 */
- // Create and reference Secure Sockets
-	{
-public:
-	static  TInt OpenL(const TDesC& aProtocolName,TSecSockDllLibraryFunction& anEntryPoint);
-	static  TInt OpenL(const TDesC& aProtocolName, TSecSockDllLibraryGenericFunction& aEntryPoint);
-	static void FindItemInDbL(const TDesC& aProtocolName, TDes& aLibraryName);
-	IMPORT_C static	void Unload();
-
-private:
-	static  void OpenWithIdL(TInt aId, const TDesC& aProtocolName, TLibraryFunction& aEntryPoint);
-	};
-
-
 class CSecureSocket : public CBase
 /** 
  * Secure sockets class. 
@@ -141,7 +47,6 @@
  *
  * @since v6.2 */
  // New secure sockets can be created through the static CSecureSocket::NewL method.
- // @public
 	{
 public:
 	IMPORT_C static CSecureSocket* NewL(RSocket& aSocket,const TDesC& aProtocol);
@@ -190,7 +95,7 @@
 
 	TUint iSecureSocketState;
 
-	TSecSockDllLibraryFunction iUNUSED;
+	TInt iUNUSED;
 	MSecureSocket* iSecureImplementation;
 	};