--- a/src/hbcore/gui/gui.pri	Mon Apr 19 14:02:13 2010 +0300
+++ b/src/hbcore/gui/gui.pri	Mon May 03 12:48:33 2010 +0300
@@ -43,46 +43,47 @@
 PUBLIC_HEADERS += $$PWD/hbview.h
 PUBLIC_HEADERS += $$PWD/hbwidget.h
 PUBLIC_HEADERS += $$PWD/hbwidgetbase.h
+PUBLIC_HEADERS += $$PWD/hbsplashscreen.h
+PUBLIC_HEADERS += $$PWD/hblongpressvisualizer.h
 
-INTERNAL_HEADERS += $$PWD/hbabstractbutton_p.h
-INTERNAL_HEADERS += $$PWD/hbactionmanager_p.h
-INTERNAL_HEADERS += $$PWD/hbactionmanagerxmlparser_p.h
-INTERNAL_HEADERS += $$PWD/hbanchorarrowdrawer_p.h
-INTERNAL_HEADERS += $$PWD/hbbackgrounditem_p.h
-INTERNAL_HEADERS += $$PWD/hbcssinspector_p.h
-INTERNAL_HEADERS += $$PWD/hbdevicefadecontrol_p.h
-INTERNAL_HEADERS += $$PWD/hbdialog_p.h
-INTERNAL_HEADERS += $$PWD/hbdockwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbfocusgroup_p.h
-INTERNAL_HEADERS += $$PWD/hblongpressvisualizer_p.h
-INTERNAL_HEADERS += $$PWD/hbmenucontainer_p.h
-INTERNAL_HEADERS += $$PWD/hbmainwindow_p.h
-INTERNAL_HEADERS += $$PWD/hbmenu_p.h
-INTERNAL_HEADERS += $$PWD/hbmenuitem_p.h
-INTERNAL_HEADERS += $$PWD/hbmenuitem_p_p.h
-INTERNAL_HEADERS += $$PWD/hbpopup_p.h
-INTERNAL_HEADERS += $$PWD/hbpopupmanager_p.h
-INTERNAL_HEADERS += $$PWD/hbpopupmanager_p_p.h
-INTERNAL_HEADERS += $$PWD/hbscrollarea_p.h
-INTERNAL_HEADERS += $$PWD/hbscrollbar_p.h
-INTERNAL_HEADERS += $$PWD/hbtestabilitysignal_p.h
-INTERNAL_HEADERS += $$PWD/hbtoolbar_p.h
-INTERNAL_HEADERS += $$PWD/hbtoolbarextension_p.h
-INTERNAL_HEADERS += $$PWD/hbtoolbutton_p.h
-INTERNAL_HEADERS += $$PWD/hbtooltiplabel_p.h
-INTERNAL_HEADERS += $$PWD/hbtooltiplabel_p_p.h
-INTERNAL_HEADERS += $$PWD/hbview_p.h
-INTERNAL_HEADERS += $$PWD/hbviewactionmanager_p.h
-INTERNAL_HEADERS += $$PWD/hbwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbwidgetbase_p.h
-INTERNAL_HEADERS += $$PWD/hbwidgetsequentialshow_p.h
-INTERNAL_HEADERS += $$PWD/hbnativewindow_sym_p.h
-INTERNAL_HEADERS += $$PWD/hbsplash_p.h
-INTERNAL_HEADERS += $$PWD/hbsplashscreen_p.h
-INTERNAL_HEADERS += $$PWD/hbfadeitem_p.h
-INTERNAL_HEADERS += $$PWD/hbcontentwidget_p.h
-INTERNAL_HEADERS += $$PWD/hbscreen_p.h
-INTERNAL_HEADERS += $$PWD/hbsplashdefs_p.h
+PRIVATE_HEADERS += $$PWD/hbabstractbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbactionmanager_p.h
+PRIVATE_HEADERS += $$PWD/hbactionmanagerxmlparser_p.h
+PRIVATE_HEADERS += $$PWD/hbanchorarrowdrawer_p.h
+PRIVATE_HEADERS += $$PWD/hbbackgrounditem_p.h
+PRIVATE_HEADERS += $$PWD/hbcssinspector_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicefadecontrol_p.h
+PRIVATE_HEADERS += $$PWD/hbdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbdockwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbfocusgroup_p.h
+PRIVATE_HEADERS += $$PWD/hbmenucontainer_p.h
+PRIVATE_HEADERS += $$PWD/hbmainwindow_p.h
+PRIVATE_HEADERS += $$PWD/hbmenu_p.h
+PRIVATE_HEADERS += $$PWD/hbmenuitem_p.h
+PRIVATE_HEADERS += $$PWD/hbmenuitem_p_p.h
+PRIVATE_HEADERS += $$PWD/hbpopup_p.h
+PRIVATE_HEADERS += $$PWD/hbpopupmanager_p.h
+PRIVATE_HEADERS += $$PWD/hbpopupmanager_p_p.h
+PRIVATE_HEADERS += $$PWD/hbscrollarea_p.h
+PRIVATE_HEADERS += $$PWD/hbscrollbar_p.h
+PRIVATE_HEADERS += $$PWD/hbtestabilitysignal_p.h
+PRIVATE_HEADERS += $$PWD/hbtoolbar_p.h
+PRIVATE_HEADERS += $$PWD/hbtoolbarextension_p.h
+PRIVATE_HEADERS += $$PWD/hbtoolbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbtooltiplabel_p.h
+PRIVATE_HEADERS += $$PWD/hbtooltiplabel_p_p.h
+PRIVATE_HEADERS += $$PWD/hbview_p.h
+PRIVATE_HEADERS += $$PWD/hbviewactionmanager_p.h
+PRIVATE_HEADERS += $$PWD/hbwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbwidgetbase_p.h
+PRIVATE_HEADERS += $$PWD/hbwidgetsequentialshow_p.h
+PRIVATE_HEADERS += $$PWD/hbnativewindow_sym_p.h
+PRIVATE_HEADERS += $$PWD/hbsplash_p.h
+PRIVATE_HEADERS += $$PWD/hbfadeitem_p.h
+PRIVATE_HEADERS += $$PWD/hbcontentwidget_p.h
+PRIVATE_HEADERS += $$PWD/hbscreen_p.h
+PRIVATE_HEADERS += $$PWD/hbsplashdefs_p.h
+PRIVATE_HEADERS += $$PWD/hblongpressvisualizer_p.h
 
 SOURCES += $$PWD/hbabstractbutton.cpp
 SOURCES += $$PWD/hbactionmanager.cpp
@@ -93,7 +94,6 @@
 SOURCES += $$PWD/hbdialog.cpp
 SOURCES += $$PWD/hbdockwidget.cpp
 SOURCES += $$PWD/hbfocusgroup_p.cpp
-SOURCES += $$PWD/hblongpressvisualizer.cpp
 SOURCES += $$PWD/hbmainwindow.cpp
 SOURCES += $$PWD/hbmainwindow_p.cpp
 SOURCES += $$PWD/hbmenu.cpp
@@ -122,12 +122,13 @@
 SOURCES += $$PWD/hbfadeitem.cpp
 SOURCES += $$PWD/hbcontentwidget.cpp
 SOURCES += $$PWD/hbscreen.cpp
+SOURCES += $$PWD/hblongpressvisualizer.cpp
 
 symbian:SOURCES += $$PWD/hbdevicefadecontrolsym.cpp
-win32|linux-*|macx-*:SOURCES += $$PWD/hbdevicefadecontrolwin.cpp
+else:SOURCES += $$PWD/hbdevicefadecontrolwin.cpp
 symbian:SOURCES += $$PWD/hbnativewindow_sym.cpp
 
 settingswindow {
-    INTERNAL_HEADERS += $$PWD/hbsettingswindow_p.h
+    PRIVATE_HEADERS += $$PWD/hbsettingswindow_p.h
     SOURCES += $$PWD/hbsettingswindow_p.cpp
 }