--- a/src/hbcore/utils/utils.pri	Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbcore/utils/utils.pri	Wed Aug 18 10:05:37 2010 +0300
@@ -32,6 +32,7 @@
 PUBLIC_HEADERS += $$PWD/hbsmileytheme.h
 
 RESTRICTED_HEADERS += $$PWD/hbfeaturemanager_r.h
+RESTRICTED_HEADERS += $$PWD/hbtextmeasurementutility_r.h
 
 PRIVATE_HEADERS += $$PWD/hbdeviceprofile_p.h
 PRIVATE_HEADERS += $$PWD/hbtypefaceinfo_p.h
@@ -39,11 +40,10 @@
 PRIVATE_HEADERS += $$PWD/hbdeviceprofiledatabase_p.h
 PRIVATE_HEADERS += $$PWD/hbdeviceprofilemanager_p.h
 PRIVATE_HEADERS += $$PWD/hbdeviceprofilereader_p.h
-PRIVATE_HEADERS += $$PWD/hbiniparser_p.h
-PRIVATE_HEADERS += $$PWD/hbtextmeasurementutility_p.h
 PRIVATE_HEADERS += $$PWD/hbthetestwidget_p.h
 PRIVATE_HEADERS += $$PWD/hbthetestutility_p.h
 PRIVATE_HEADERS += $$PWD/hbtextutils_p.h
+PRIVATE_HEADERS += $$PWD/hbtextmeasurementutility_r_p.h
 PRIVATE_HEADERS += $$PWD/hbtypefacexmlparser_p.h
 PRIVATE_HEADERS += $$PWD/hbscreenmode_p.h
 PRIVATE_HEADERS += $$PWD/hbdevicemodeinfo_p.h
@@ -77,8 +77,7 @@
 SOURCES += $$PWD/hbdeviceprofilemanager_p.cpp
 SOURCES += $$PWD/hbdeviceprofilereader_p.cpp
 SOURCES += $$PWD/hbfontspec.cpp
-SOURCES += $$PWD/hbiniparser.cpp
-SOURCES += $$PWD/hbtextmeasurementutility_p.cpp
+SOURCES += $$PWD/hbtextmeasurementutility.cpp
 SOURCES += $$PWD/hbthetestwidget_p.cpp
 SOURCES += $$PWD/hbthetestutility_p.cpp
 SOURCES += $$PWD/hbtextutils_p.cpp