--- a/QTfrontend/binds.h	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/binds.h	Wed Feb 21 19:40:06 2007 +0000
@@ -20,7 +20,6 @@
 #define BINDS_H
 
 #include <QString>
-#include <QtGlobal>
 
 #define BINDS_NUMBER 31
 

--- a/QTfrontend/frameTeam.h	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/frameTeam.h	Wed Feb 21 19:40:06 2007 +0000
@@ -22,7 +22,6 @@
 #include <QWidget>
 #include <QList>
 #include <QColor>
-#include <QMultiMap>
 
 #include "teamselect.h"
 

--- a/QTfrontend/gameuiconfig.cpp	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/gameuiconfig.cpp	Wed Feb 21 19:40:06 2007 +0000
@@ -17,6 +17,9 @@
  */
 
 #include <QMessageBox>
+#include <QCheckBox>
+#include <QLineEdit>
+
 #include "gameuiconfig.h"
 #include "hwform.h"
 #include "pages.h"

--- a/QTfrontend/hwform.cpp	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/hwform.cpp	Wed Feb 21 19:40:06 2007 +0000
@@ -87,10 +87,6 @@
 	connect(ui.pageNetGame->BtnBack,	SIGNAL(clicked()),	this, SLOT(GoBack()));
 	connect(ui.pageNetGame->BtnGo,	SIGNAL(clicked()),	this, SLOT(NetStartGame()));
 
-	connect(ui.pageNetChat->BtnDisconnect, SIGNAL(clicked()), this, SLOT(NetDisconnect()));
-	connect(ui.pageNetChat->BtnJoin,	SIGNAL(clicked()),	this, SLOT(NetJoin()));
-	connect(ui.pageNetChat->BtnCreate,	SIGNAL(clicked()),	this, SLOT(NetCreate()));
-
 	connect(ui.pageInfo->BtnBack,	SIGNAL(clicked()),	this, SLOT(GoBack()));
 
 	connect(ui.pageGameStats->BtnBack,	SIGNAL(clicked()),	this, SLOT(GoBack()));
@@ -268,13 +264,13 @@
 	connect(hwnet, SIGNAL(EnteredGame()), this, SLOT(NetGameEnter()));
 	connect(hwnet, SIGNAL(AddNetTeam(const HWTeam&)), this, SLOT(AddNetTeam(const HWTeam&)));
 
-	connect(hwnet, SIGNAL(chatStringFromNet(const QStringList&)), 
+	connect(hwnet, SIGNAL(chatStringFromNet(const QStringList&)),
 		ui.pageNetGame->pChatWidget, SLOT(onChatStringFromNet(const QStringList&)));
 	connect(ui.pageNetGame->pChatWidget, SIGNAL(chatLine(const QString&)),
 		hwnet, SLOT(chatLineToNet(const QString&)));
-	connect(hwnet, SIGNAL(nickAdded(const QString&)), 
+	connect(hwnet, SIGNAL(nickAdded(const QString&)),
 		ui.pageNetGame->pChatWidget, SLOT(nickAdded(const QString&)));
-	connect(hwnet, SIGNAL(nickRemoved(const QString&)), 
+	connect(hwnet, SIGNAL(nickRemoved(const QString&)),
 		ui.pageNetGame->pChatWidget, SLOT(nickRemoved(const QString&)));
 
 	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(hhogsNumChanged(const HWTeam&)),
@@ -348,26 +344,11 @@
   GoBack();
 }
 
-void HWForm::AddGame(const QString & chan)
-{
-	ui.pageNetChat->ChannelsList->addItem(chan);
-}
-
 void HWForm::NetGameEnter()
 {
 	GoToPage(ID_PAGE_NETCFG);
 }
 
-void HWForm::NetJoin()
-{
-	hwnet->JoinGame("#hw");
-}
-
-void HWForm::NetCreate()
-{
-	hwnet->JoinGame("#hw");
-}
-
 void HWForm::NetStartGame()
 {
   ui.pageNetGame->BtnGo->setText(QPushButton::tr("Waiting"));

--- a/QTfrontend/hwform.h	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/hwform.h	Wed Feb 21 19:40:06 2007 +0000
@@ -19,9 +19,7 @@
 #ifndef HWFORM_H
 #define HWFORM_H
 
-#include <QLabel>
-#include <QLineEdit>
-#include <QDir>
+#include <QMainWindow>
 #include <QStack>
 
 #include "netserver.h"
@@ -63,9 +61,6 @@
 	void NetConnectServer();
 	void NetStartServer();
 	void NetDisconnect();
-	void NetJoin();
-	void NetCreate();
-	void AddGame(const QString & chan);
 	void NetGameEnter();
 	void NetStartGame();
 	void AddNetTeam(const HWTeam& team);

--- a/QTfrontend/pages.cpp	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/pages.cpp	Wed Feb 21 19:40:06 2007 +0000
@@ -17,7 +17,6 @@
  */
 
 #include <QGridLayout>
-#include <QDir>
 #include <QPushButton>
 #include <QGroupBox>
 #include <QComboBox>
@@ -295,9 +294,6 @@
 	BtnBack->setText(QPushButton::tr("Back"));
 	pageLayout->addWidget(BtnBack, 1, 0);
 
-	//HWMapContainer* pMapContainer=new HWMapContainer(this);
-	//pageLayout->addWidget(pMapContainer, 1, 1);
-
 	gameCFG = new GameCFGWidget(this);
 	pageLayout->addWidget(gameCFG, 0, 0, 1, 2);
 	teamsSelect = new TeamSelWidget(this);
@@ -480,33 +476,6 @@
 	pageLayout->addWidget(BtnBack, 3, 0);
 }
 
-PageNetChat::PageNetChat(QWidget* parent) : QWidget(parent)
-{
-	QFont * font14 = new QFont("MS Shell Dlg", 14);
-	QGridLayout * pageLayout = new QGridLayout(this);
-	pageLayout->setColumnStretch(0, 1);
-	pageLayout->setColumnStretch(1, 1);
-	pageLayout->setColumnStretch(2, 1);
-
-	BtnDisconnect = new QPushButton(this);
-	BtnDisconnect->setFont(*font14);
-	BtnDisconnect->setText(QPushButton::tr("Disconnect"));
-	pageLayout->addWidget(BtnDisconnect, 2, 0);
-
-	ChannelsList = new QListWidget(this);
-	pageLayout->addWidget(ChannelsList, 0, 1);
-
-	BtnJoin = new QPushButton(this);
-	BtnJoin->setFont(*font14);
-	BtnJoin->setText(QPushButton::tr("Join"));
-	pageLayout->addWidget(BtnJoin, 2, 2);
-
-	BtnCreate = new QPushButton(this);
-	BtnCreate->setFont(*font14);
-	BtnCreate->setText(QPushButton::tr("Create"));
-	pageLayout->addWidget(BtnCreate, 1, 2);
-}
-
 PageNetGame::PageNetGame(QWidget* parent) : QWidget(parent)
 {
 	QFont * font14 = new QFont("MS Shell Dlg", 14);

--- a/QTfrontend/pages.h	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/pages.h	Wed Feb 21 19:40:06 2007 +0000
@@ -174,19 +174,6 @@
 	QLineEdit * editIP;
 };
 
-class PageNetChat : public QWidget
-{
-	Q_OBJECT
-
-public:
-	PageNetChat(QWidget* parent = 0);
-
-	QPushButton *BtnDisconnect;
-	QListWidget *ChannelsList;
-	QPushButton *BtnJoin;
-	QPushButton *BtnCreate;
-};
-
 class PageNetGame : public QWidget
 {
 	Q_OBJECT

--- a/QTfrontend/team.cpp	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/team.cpp	Wed Feb 21 19:40:06 2007 +0000
@@ -19,14 +19,14 @@
 #include <QFile>
 #include <QTextStream>
 #include <QApplication>
-#include <QSpinBox>
+#include <QStringList>
+#include <QLineEdit>
 #include "team.h"
 #include "hwform.h"
 #include "predefteams.h"
 #include "pages.h"
 #include "hwconsts.h"
 
-#include <QStringList>
 
 HWTeam::HWTeam(const QString & teamname, unsigned int netID) :
   difficulty(0),

--- a/QTfrontend/teamselect.h	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/teamselect.h	Wed Feb 21 19:40:06 2007 +0000
@@ -22,9 +22,7 @@
 #include <QGroupBox>
 #include <QVBoxLayout>
 #include <QColor>
-
-#include <list>
-#include <map>
+#include <QMultiMap>
 
 #include "team.h"
 
@@ -54,7 +52,7 @@
   void changeHHNum(const HWTeam&);
   void changeTeamColor(const HWTeam&);
   void changeTeamStatus(HWTeam team);
-  
+
  signals:
   void NewTeam();
   void teamWillPlay(HWTeam team);
@@ -62,7 +60,7 @@
   void hhogsNumChanged(const HWTeam&);
   void teamColorChanged(const HWTeam&);
   void acceptRequested(HWTeam team);
-  
+
  private slots:
   void pre_changeTeamStatus(HWTeam);
   void newTeamClicked();

--- a/QTfrontend/ui_hwform.cpp	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/ui_hwform.cpp	Wed Feb 21 19:40:06 2007 +0000
@@ -18,6 +18,9 @@
 
 #include <QVBoxLayout>
 #include <QGridLayout>
+#include <QMainWindow>
+#include <QStackedLayout>
+
 #include "ui_hwform.h"
 #include "pages.h"
 
@@ -68,9 +71,6 @@
 	pageNet = new PageNet();
 	Pages->addWidget(pageNet);
 
-	pageNetChat	= new PageNetChat();
-	Pages->addWidget(pageNetChat);
-
 	pageNetGame	= new PageNetGame();
 	Pages->addWidget(pageNetGame);
 

--- a/QTfrontend/ui_hwform.h	Wed Feb 21 19:18:05 2007 +0000
+++ b/QTfrontend/ui_hwform.h	Wed Feb 21 19:40:06 2007 +0000
@@ -16,26 +16,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
- #ifndef UI_HWFORM_H
+#ifndef UI_HWFORM_H
 #define UI_HWFORM_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QListWidget>
-#include <QtGui/QMainWindow>
-#include <QtGui/QPushButton>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QToolBox>
-#include <QtGui/QWidget>
-#include <QStackedLayout>
-
 class PageMain;
 class PageLocalGame;
 class PageEditTeam;
@@ -47,6 +30,10 @@
 class PageNetGame;
 class PageInfo;
 class PageGameStats;
+class QStackedLayout;
+class QFont;
+class QWidget;
+class QMainWindow;
 
 class Ui_HWForm
 {