-# Input
-HDRS += chatline.h chatwidget.h coreconnectdlg.h mainwidget.h qtopiagui.h qtopiamainwin.h topicbar.h
-SRCS += chatline.cpp chatwidget.cpp coreconnectdlg.cpp mainwidget.cpp qtopiagui.cpp qtopiamainwin.cpp main.cpp topicbar.cpp
-FRMS += ui/coreconnectdlg.ui ui/coreconnectprogressdlg.ui ui/editcoreacctdlg.ui ui/mainwidget.ui
+DEPMOD = uisupport common client
+QT_MOD = core gui network
+
+HDRS += bufferviewwidget.h chatline.h chatwidget.h coreconnectdlg.h mainwidget.h nicklistwidget.h \
+ qtopiaui.h qtopiamainwin.h qtopiauistyle.h topicbar.h
+SRCS += bufferviewwidget.cpp chatline.cpp chatwidget.cpp coreconnectdlg.cpp main.cpp mainwidget.cpp nicklistwidget.cpp \
+ qtopiaui.cpp qtopiamainwin.cpp qtopiauistyle.cpp topicbar.cpp
+FORMNAMES += aboutdlg.ui bufferviewwidget.ui coreconnectdlg.ui coreconnectprogressdlg.ui editcoreacctdlg.ui mainwidget.ui nicklistwidget.ui
+
+for(ui, FORMNAMES) {
+ FRMS += ui/$${ui}
+}