--- a/aknlayoutcompiler/src/MLCompDataLayPerfWriter.cpp	Thu Dec 17 09:14:18 2009 +0200
+++ b/aknlayoutcompiler/src/MLCompDataLayPerfWriter.cpp	Mon Jan 18 21:13:05 2010 +0200
@@ -22,8 +22,8 @@
 #include "LayoutCompilerErr.h"
 #include "CodeGenConsts.h"
 
-#include <cdlcompilertoolkit/cdltkinterface.h>
-#include <cdlcompilertoolkit/cdltkutil.h>
+#include <CdlCompilerToolkit/CdlTkInterface.h>
+#include <CdlCompilerToolkit/CdlTkUtil.h>
 
 #include <iostream>
 #include <sstream>
@@ -88,7 +88,7 @@
 	out << "\n// Layout MACROs for Layout Table : ";
 	out << iTable.Name() << endl;
 
-	for (int i=0; i<iTable.size(); ++i)
+	for (unsigned int i=0; i<iTable.size(); ++i)
 		{
 		WriteLine(out, *iTable[i]);
 		}
@@ -187,8 +187,8 @@
 
 TMLCompDataLayPerfWriter::TMLCompDataLayPerfWriter(CCdlTkInterface& aInterface, TMLCompData& aLayout, const std::string& aName)
 	:
-	iInterface(aInterface), 
-	TMLWriterBase<TMLCompData>(aLayout, aName)
+	TMLWriterBase<TMLCompData>(aLayout, aName),
+	iInterface(aInterface)
 	{
 	}
 
@@ -201,7 +201,7 @@
 	string ifName(iInterface.Header().Name());
 
 	out << "// function implementations: " << endl;
-	int tableId = 0;
+	unsigned int tableId = 0;
 	for (TMLCompData::iterator pTab = iLayout.begin(); pTab != iLayout.end(); ++pTab)
 		{
 		TMLCompDataLayPerfTableWriter writer(this, **pTab, ifName, tableId++);