--- a/package_definition.xml	Mon Mar 15 12:43:30 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="svgt" name="SVG Tiny" levels="util ui">
-    <collection id="svgt_info" name="SVG Tiny Info" level="ui">
-      <component id="svgt_plat" filter="s60" name="SVG Tiny Platform Interfaces" class="api" introduced="9.2">
-        <unit bldFile="svgt_plat/group"/>
-      </component>
-    </collection>
-    <collection id="svgtopt" name="SVG-T Engine" level="util">
-      <component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
-        <unit bldFile="svgtopt/group"/>
-      </component>
-      <component id="nvgdecoder" filter="s60" name="NVG Decoder" introduced="9.2">
-		<!-- extract relevant parts of above bld.inf or remove this component -->
-      </component>
-      <component id="svgengineji" filter="s60" name="SVG Engine Java Interface" introduced="9.2">
-		<!-- extract relevant parts of above bld.inf or remove this component -->
-      </component>
-      <component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
-        <unit bldFile="svgtopt/svgtplugin/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>

--- a/svgtopt/SVG/SVGEngine/inc/SVGContentHandler.h	Mon Mar 15 12:43:30 2010 +0200
+++ b/svgtopt/SVG/SVGEngine/inc/SVGContentHandler.h	Wed Mar 31 23:03:24 2010 +0300
@@ -28,8 +28,8 @@
 #include "SVGAttributeVerifier.h"
 #include "SVGErrorImpl.h"
 
-#include "mxmlattributes.h"
-#include "mxmlcontenthandler.h"
+#include "MXMLAttributes.h"
+#include "MXMLContentHandler.h"
 
 #include "SVGSchemaData.h"
 #include "SVGDocumentImpl.h"

--- a/svgtopt/SVG/SVGEngine/src/SVGContentHandler.cpp	Mon Mar 15 12:43:30 2010 +0200
+++ b/svgtopt/SVG/SVGEngine/src/SVGContentHandler.cpp	Wed Mar 31 23:03:24 2010 +0300
@@ -26,7 +26,7 @@
 
 #include "SVGUseElementImpl.h"
 #include "SVGAnimationElementImpl.h"
-#include "rxmlreader.h"
+#include "RXMLReader.h"
 
 #include "SVGPaintCssValueImpl.h"
 #include "SVGPathElementImpl.h"

--- a/svgtopt/SVGTPlugin/inc/Svgtplugin.h	Mon Mar 15 12:43:30 2010 +0200
+++ b/svgtopt/SVGTPlugin/inc/Svgtplugin.h	Wed Mar 31 23:03:24 2010 +0300
@@ -33,9 +33,9 @@
 #include "SVGListener.h"
 
 #include <npupp.h>
-#include <pluginadapterinterface.h>
+#include <PluginAdapterInterface.h>
 
-#include <cecombrowserplugininterface.h>
+#include <CEcomBrowserPluginInterface.h>
 
 #include "MRepositoryVolumeObserver.h"
 

--- a/svgtopt/SVGTPlugin/src/RepositoryVolumeListener.cpp	Mon Mar 15 12:43:30 2010 +0200
+++ b/svgtopt/SVGTPlugin/src/RepositoryVolumeListener.cpp	Wed Mar 31 23:03:24 2010 +0300
@@ -23,7 +23,7 @@
 #include "RepositoryVolumeListener.h"
 //#include <SharedDataKeys.h> //include this file when KSDUidMediaVolumeControl and KMediaVolume will be needed
 //#include "epocdebug.h"
-#include <browseruisdkcrkeys.h>
+#include <BrowserUiSDKCRKeys.h>
 #include "MRepositoryVolumeObserver.h"
 
 CRepositoryVolumeListener* CRepositoryVolumeListener::NewL(MRepositoryVolumeObserver* aObserver)

--- a/svgtopt/SVGTPlugin/src/Svgtpluginmain.cpp	Mon Mar 15 12:43:30 2010 +0200
+++ b/svgtopt/SVGTPlugin/src/Svgtpluginmain.cpp	Wed Mar 31 23:03:24 2010 +0300
@@ -20,7 +20,7 @@
 
 
 #include <implementationproxy.h>
-#include <cecombrowserplugininterface.h>
+#include <CEcomBrowserPluginInterface.h>
 /***************************************************/
 /**********ECOM STYLE SVGT PLUGIN ENTRY POINTS******/
 /***************************************************/

--- a/svgtopt/SVGTPlugin/src/VolumeKeyListener.cpp	Mon Mar 15 12:43:30 2010 +0200
+++ b/svgtopt/SVGTPlugin/src/VolumeKeyListener.cpp	Wed Mar 31 23:03:24 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <eikapp.h>
 #include <aknconsts.h>
-#include <browseruisdkcrkeys.h>
+#include <BrowserUiSDKCRKeys.h>
 
 #include "VolumeKeyListener.h" 
 #include "MRepositoryVolumeObserver.h"