diff -r aa99f2208aad -r b8d18c84f71c localisation/apparchitecture/apsexe/APSMAIN.CPP
--- a/localisation/apparchitecture/apsexe/APSMAIN.CPP	Wed Jul 28 16:03:37 2010 +0100
+++ b/localisation/apparchitecture/apsexe/APSMAIN.CPP	Tue Aug 03 10:20:34 2010 +0100
@@ -1,7 +1,7 @@
 // Copyright (c) 1997-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".
 //
@@ -13,51 +13,22 @@
 // Description:
 // The main startup of the AppArc server
 // 
-//
-
-#include "APASVST.H"
-
-
-#ifdef APA_SERVER_IN_THREAD
-// The server binary is an "EPOCEXE" target type
-// Thus the server parameter passing and startup code for WINS and EPOC are
-// significantly different.
-//
-// In EKA1 WINS, the EPOCEXE target is a DLL with an entry point called WinsMain,
-// taking no parameters and returning TInt. This is not really valid as a thread
-// function which takes a TAny* parameter which we need.
-//
-// So the DLL entry-point WinsMain() is used to return a TInt representing the
-// real thread function within the DLL. This is good as long as
-// sizeof(TInt)>=sizeof(ApaServThreadStart).
+// apsmain.cpp
 //
 
-IMPORT_C TInt WinsMain();
-EXPORT_C TInt WinsMain()
-//
-// WINS DLL entry-point. Just return the real thread function 
-// cast to TInt
-//
-	{
-	return reinterpret_cast<TInt>(&ApaServThreadStart);
-	}
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#if !defined(__APA_INTERNAL_H__)
+#include "apainternal.h"
+#endif
+#else
+#include "APASVST.H"
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
-GLDEF_C TInt E32Dll(TDllReason /*aReason*/)
-//
-//	DLL entry point
-//
-	{
-	return(KErrNone);
-	}
-
-#else
-
-TInt E32Main()
 //
 //	EXE entry point
 //
+TInt E32Main()
 	{
-	return ApaServThreadStart(NULL);
+	return ApaServThreadStart();
 	}
 	
-#endif