--- a/src/hbinput/inputwidgets/inputwidgets.pri	Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/inputwidgets.pri	Fri May 14 16:09:54 2010 +0300
@@ -30,53 +30,38 @@
 # hb input widget public headers
 PUBLIC_HEADERS += $$PWD/hbinputvkbwidget.h
 PUBLIC_HEADERS += $$PWD/hbinputvirtualrocker.h
-PUBLIC_HEADERS += $$PWD/hbinputtouchkeypadbutton.h
-PUBLIC_HEADERS += $$PWD/hbinput12keytouchkeypad.h
-PUBLIC_HEADERS += $$PWD/hbinputsctportrait.h
-PUBLIC_HEADERS += $$PWD/hbinputusedsymbolpane.h
 PUBLIC_HEADERS += $$PWD/hbinputcandidatelist.h
-PUBLIC_HEADERS += $$PWD/hbinputqwertytouchkeyboard.h
-PUBLIC_HEADERS += $$PWD/hbinputpreviewlabel.h
-PUBLIC_HEADERS += $$PWD/hbinputcharpreviewpane.h
 PUBLIC_HEADERS += $$PWD/hbinputmodeindicator.h
-PUBLIC_HEADERS += $$PWD/hbinputcustombuttonlist.h
 PUBLIC_HEADERS += $$PWD/hbinputexactwordpopup.h
-PUBLIC_HEADERS += $$PWD/hbinputsctlandscape.h
 PUBLIC_HEADERS += $$PWD/hbinputcommondialogs.h
-PUBLIC_HEADERS += $$PWD/hbinputsettingdialog.h
 PUBLIC_HEADERS += $$PWD/hbinputhwtoolcluster.h
 PUBLIC_HEADERS += $$PWD/hbinputsmileypicker.h
 PUBLIC_HEADERS += $$PWD/hbinputscreenshotwidget.h
 PUBLIC_HEADERS += $$PWD/hbinputsettinglist.h
 PUBLIC_HEADERS += $$PWD/hbinputsettingwidget.h
+PUBLIC_HEADERS += $$PWD/hbinputbuttongroup.h
+PUBLIC_HEADERS += $$PWD/hbinputbutton.h
+PUBLIC_HEADERS += $$PWD/hbinputsctkeyboard.h
+
 # hb input widget private headers
 PRIVATE_HEADERS += $$PWD/hbinputvkbwidget_p.h
-PRIVATE_HEADERS += $$PWD/hbinput12keytouchkeypad_p.h
-PRIVATE_HEADERS += $$PWD/hbinputqwertytouchkeyboard_p.h
-PRIVATE_HEADERS += $$PWD/hbinputsctlandscape_p.h
-PRIVATE_HEADERS += $$PWD/hbinputsctportrait_p.h
 PRIVATE_HEADERS += $$PWD/hbinputcheckboxlist_p.h
+PRIVATE_HEADERS += $$PWD/hbinputbuttongroup_p.h
+PRIVATE_HEADERS += $$PWD/hbinputsctkeyboard_p.h
 
 # hb input widget sources
 SOURCES += $$PWD/hbinputvkbwidget.cpp
 SOURCES += $$PWD/hbinputvirtualrocker.cpp
-SOURCES += $$PWD/hbinputtouchkeypadbutton.cpp
-SOURCES += $$PWD/hbinput12keytouchkeypad.cpp
-SOURCES += $$PWD/hbinputsctportrait.cpp
-SOURCES += $$PWD/hbinputusedsymbolpane.cpp
 SOURCES += $$PWD/hbinputcandidatelist.cpp
-SOURCES += $$PWD/hbinputqwertytouchkeyboard.cpp
-SOURCES += $$PWD/hbinputpreviewlabel.cpp
-SOURCES += $$PWD/hbinputcharpreviewpane.cpp
 SOURCES += $$PWD/hbinputmodeindicator.cpp
-SOURCES += $$PWD/hbinputcustombuttonlist.cpp
 SOURCES += $$PWD/hbinputexactwordpopup.cpp
-SOURCES += $$PWD/hbinputsctlandscape.cpp
 SOURCES += $$PWD/hbinputcommondialogs.cpp
-SOURCES += $$PWD/hbinputsettingdialog.cpp
 SOURCES += $$PWD/hbinputhwtoolcluster.cpp
 SOURCES += $$PWD/hbinputsmileypicker.cpp
 SOURCES += $$PWD/hbinputscreenshotwidget.cpp
 SOURCES += $$PWD/hbinputsettinglist.cpp
 SOURCES += $$PWD/hbinputsettingwidget.cpp
 SOURCES += $$PWD/hbinputcheckboxlist.cpp
+SOURCES += $$PWD/hbinputbuttongroup.cpp
+SOURCES += $$PWD/hbinputbutton.cpp
+SOURCES += $$PWD/hbinputsctkeyboard.cpp