diff --git a/linux/sound.h b/linux/sound.h
index 09ffcaa3..44dcb851 100755
--- a/linux/sound.h
+++ b/linux/sound.h
@@ -31,7 +31,7 @@
 #include <sys/ioctl.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <qthread.h>
+#include <QThread>
 #include <string.h>
 #include "util.h"
 #include "soundbase.h"
diff --git a/mac/sound.h b/mac/sound.h
index 57284056..7fe74960 100755
--- a/mac/sound.h
+++ b/mac/sound.h
@@ -28,7 +28,7 @@
 #include <CoreServices/CoreServices.h>
 #include <AudioUnit/AudioUnit.h>
 #include <CoreAudio/AudioHardware.h>
-#include <qmutex.h>
+#include <QMutex>
 #include "util.h"
 #include "soundbase.h"
 #include "global.h"
diff --git a/src/audiomixerboard.h b/src/audiomixerboard.h
index 04d705e3..143f8748 100755
--- a/src/audiomixerboard.h
+++ b/src/audiomixerboard.h
@@ -25,15 +25,15 @@
 #if !defined ( MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_ )
 #define MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_
 
-#include <qframe.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qstring.h>
-#include <qslider.h>
-#include <qsizepolicy.h>
-#include <qhostaddress.h>
+#include <QFrame>
+#include <QGroupBox>
+#include <QLabel>
+#include <QCheckBox>
+#include <QLayout>
+#include <QString>
+#include <QSlider>
+#include <QSizePolicy>
+#include <QHostAddress>
 #include "global.h"
 #include "util.h"
 
diff --git a/src/channel.h b/src/channel.h
index 86d38d82..59fef9bd 100755
--- a/src/channel.h
+++ b/src/channel.h
@@ -25,10 +25,10 @@
 #if !defined ( CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ )
 #define CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_
 
-#include <qthread.h>
-#include <qdatetime.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QThread>
+#include <QDateTime>
+#include <QFile>
+#include <QTextStream>
 #include "global.h"
 #include "buffer.h"
 #include "util.h"
diff --git a/src/chatdlg.h b/src/chatdlg.h
index f0b6be03..0dab792a 100755
--- a/src/chatdlg.h
+++ b/src/chatdlg.h
@@ -22,13 +22,13 @@
  *
 \******************************************************************************/
 
-#include <qlabel.h>
-#include <qstring.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qaccessible.h>
+#include <QLabel>
+#include <QString>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QWhatsThis>
+#include <QLayout>
+#include <QAccessible>
 #include "global.h"
 #ifdef _WIN32
 # include "../windows/moc/chatdlgbase.h"
diff --git a/src/client.h b/src/client.h
index 1121de85..9cce41ee 100755
--- a/src/client.h
+++ b/src/client.h
@@ -25,12 +25,11 @@
 #if !defined ( CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ )
 #define CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_
 
-#include <qglobal.h>
-#include <qhostaddress.h>
-#include <qhostinfo.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qmessagebox.h>
+#include <QHostAddress>
+#include <QHostInfo>
+#include <QString>
+#include <QDateTime>
+#include <QMessageBox>
 #include "celt.h"
 #include "global.h"
 #include "socket.h"
diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h
index 226ad5b7..44118c23 100755
--- a/src/clientsettingsdlg.h
+++ b/src/clientsettingsdlg.h
@@ -22,18 +22,18 @@
  *
 \******************************************************************************/
 
-#include <qlabel.h>
-#include <qstring.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qprogressbar.h>
-#include <qwhatsthis.h>
-#include <qtimer.h>
-#include <qslider.h>
-#include <qradiobutton.h>
-#include <qmenubar.h>
-#include <qlayout.h>
-#include <qbuttongroup.h>
+#include <QLabel>
+#include <QString>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QProgressBar>
+#include <QWhatsThis>
+#include <QTimer>
+#include <QSlider>
+#include <QRadioButton>
+#include <QMenuBar>
+#include <QLayout>
+#include <QButtonGroup>
 #include "global.h"
 #include "client.h"
 #include "multicolorled.h"
diff --git a/src/connectdlg.h b/src/connectdlg.h
index a87ada97..398b3339 100755
--- a/src/connectdlg.h
+++ b/src/connectdlg.h
@@ -22,13 +22,13 @@
  *
 \******************************************************************************/
 
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
-#include <qtimer.h>
-#include <qmutex.h>
-#include <qlocale.h>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QWhatsThis>
+#include <QTimer>
+#include <QMutex>
+#include <QLocale>
 #include "global.h"
 #include "client.h"
 #ifdef _WIN32
diff --git a/src/global.h b/src/global.h
index 3262fc5b..3d0a5441 100755
--- a/src/global.h
+++ b/src/global.h
@@ -50,9 +50,9 @@ LED bar:      lbr
 #if !defined ( GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_ )
 #define GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_
 
-#include <qstring.h>
-#include <qevent.h>
-#include <qdebug.h>
+#include <QString>
+#include <QEvent>
+#include <QDebug>
 #include <stdio.h>
 #include <math.h>
 #include <string>
diff --git a/src/llconclientdlg.h b/src/llconclientdlg.h
index 2ae84ccc..37fac06a 100755
--- a/src/llconclientdlg.h
+++ b/src/llconclientdlg.h
@@ -22,17 +22,17 @@
  *
 \******************************************************************************/
 
-#include <qlabel.h>
-#include <qstring.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qprogressbar.h>
-#include <qwhatsthis.h>
-#include <qtimer.h>
-#include <qslider.h>
-#include <qradiobutton.h>
-#include <qmenubar.h>
-#include <qlayout.h>
+#include <QLabel>
+#include <QString>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QProgressBar>
+#include <QWhatsThis>
+#include <QTimer>
+#include <QSlider>
+#include <QRadioButton>
+#include <QMenuBar>
+#include <QLayout>
 #include "global.h"
 #include "client.h"
 #include "settings.h"
diff --git a/src/llconserverdlg.h b/src/llconserverdlg.h
index 66cb9aee..9cd1ad63 100755
--- a/src/llconserverdlg.h
+++ b/src/llconserverdlg.h
@@ -22,16 +22,17 @@
  *
 \******************************************************************************/
 
-#include <qlabel.h>
-#include <qlistview.h>
-#include <qtimer.h>
-#include <qpixmap.h>
-#include <qthread.h>
-#include <qslider.h>
-#include <qmenubar.h>
-#include <qlayout.h>
-#include <qsystemtrayicon.h>
-#include <qsettings.h>
+#include <QCloseEvent>
+#include <QLabel>
+#include <QListView>
+#include <QTimer>
+#include <QPixmap>
+#include <QThread>
+#include <QSlider>
+#include <QMenuBar>
+#include <QLayout>
+#include <QSystemTrayIcon>
+#include <QSettings>
 #include "global.h"
 #include "server.h"
 #include "settings.h"
diff --git a/src/main.cpp b/src/main.cpp
index f5fe0091..3d51a82e 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,10 +22,10 @@
  *
 \******************************************************************************/
 
-#include <qapplication.h>
-#include <qmessagebox.h>
-#include <qdir.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QMessageBox>
+#include <QDir>
+#include <QTextStream>
 #include "global.h"
 #include "llconclientdlg.h"
 #include "llconserverdlg.h"
diff --git a/src/multicolorled.h b/src/multicolorled.h
index 193a5815..f9cbcf1a 100755
--- a/src/multicolorled.h
+++ b/src/multicolorled.h
@@ -32,11 +32,11 @@
 #if !defined ( _MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_ )
 #define _MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_
 
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qtimer.h>
-#include <qtreewidget.h>
-#include <qicon.h>
+#include <QLabel>
+#include <QPixmap>
+#include <QTimer>
+#include <QTreeWidget>
+#include <QIcon>
 #include "global.h"
 
 
diff --git a/src/multicolorledbar.h b/src/multicolorledbar.h
index 15cb42a1..138902f7 100755
--- a/src/multicolorledbar.h
+++ b/src/multicolorledbar.h
@@ -25,10 +25,10 @@
 #if !defined ( _MULTCOLORLEDBAR_H__FD6B49B5_87DF_48DD_E1606C2AC__INCLUDED_ )
 #define _MULTCOLORLEDBAR_H__FD6B49B5_87DF_48DD_E1606C2AC__INCLUDED_
 
-#include <qframe.h>
-#include <qpixmap.h>
-#include <qtimer.h>
-#include <qlayout.h>
+#include <QFrame>
+#include <QPixmap>
+#include <QTimer>
+#include <QLayout>
 #include "util.h"
 #include "global.h"
 
diff --git a/src/protocol.h b/src/protocol.h
index 0572eb0f..86eac3d6 100755
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -25,10 +25,9 @@
 #if !defined ( PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_ )
 #define PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_
 
-#include <qglobal.h>
-#include <qmutex.h>
-#include <qtimer.h>
-#include <qdatetime.h>
+#include <QMutex>
+#include <QTimer>
+#include <QDateTime>
 #include <list>
 #include "global.h"
 #include "util.h"
diff --git a/src/server.h b/src/server.h
index 0c29f0c3..b6b42a4b 100755
--- a/src/server.h
+++ b/src/server.h
@@ -25,10 +25,10 @@
 #if !defined ( SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ )
 #define SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_
 
-#include <qobject.h>
-#include <qtimer.h>
-#include <qdatetime.h>
-#include <qhostaddress.h>
+#include <QObject>
+#include <QTimer>
+#include <QDateTime>
+#include <QHostAddress>
 #include "celt.h"
 #include "global.h"
 #include "socket.h"
diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index ce1950c8..7ea7a02b 100755
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -35,8 +35,8 @@ CServerListManager::CServerListManager ( const quint16  iNPortNum,
     : iPortNumber                     ( iNPortNum ),
       iNumPredefinedServers           ( 0 ),
       bUseDefaultCentralServerAddress ( false ),
-      pConnLessProtocol               ( pNConLProt ),
-      bCentServPingServerInList       ( bNCentServPingServerInList )
+      bCentServPingServerInList       ( bNCentServPingServerInList ),
+      pConnLessProtocol               ( pNConLProt )
 {
     // set the central server address
     SetCentralServerAddress ( sNCentServAddr );
diff --git a/src/serverlist.h b/src/serverlist.h
index 29ac78e8..b52f2c50 100755
--- a/src/serverlist.h
+++ b/src/serverlist.h
@@ -60,11 +60,11 @@ private network.
 #if !defined ( SERVERLIST_HOIJH8OUWEF_WFEIOBU_3_43445KJIUHF1912__INCLUDED_ )
 #define SERVERLIST_HOIJH8OUWEF_WFEIOBU_3_43445KJIUHF1912__INCLUDED_
 
-#include <qobject.h>
-#include <qlocale.h>
-#include <qlist.h>
-#include <qtimer.h>
-#include <qmutex.h>
+#include <QObject>
+#include <QLocale>
+#include <QList>
+#include <QTimer>
+#include <QMutex>
 #include "global.h"
 #include "util.h"
 #include "protocol.h"
diff --git a/src/serverlogging.h b/src/serverlogging.h
index 37e833d3..01e9d60f 100755
--- a/src/serverlogging.h
+++ b/src/serverlogging.h
@@ -25,13 +25,13 @@
 #if !defined ( SERVERLOGGING_HOIHOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ )
 #define SERVERLOGGING_HOIHOKIH83JH8_3_43445KJIUHF1912__INCLUDED_
 
-#include <qimage.h>
-#include <qpainter.h>
-#include <qdatetime.h>
-#include <qhostaddress.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qtimer.h>
+#include <QImage>
+#include <QPainter>
+#include <QDateTime>
+#include <QHostAddress>
+#include <QFile>
+#include <QString>
+#include <QTimer>
 #include "global.h"
 #include "util.h"
 
diff --git a/src/settings.h b/src/settings.h
index 0e37917b..56851bb6 100755
--- a/src/settings.h
+++ b/src/settings.h
@@ -25,11 +25,11 @@
 #if !defined ( SETTINGS_H__3B0BA660_DGEG56G456G9876D31912__INCLUDED_ )
 #define SETTINGS_H__3B0BA660_DGEG56G456G9876D31912__INCLUDED_
 
-#include <qdom.h>
-#include <qfile.h>
-#include <qsettings.h>
-#include <qdir.h>
-#include <qtextstream.h>
+#include <QDomDocument>
+#include <QFile>
+#include <QSettings>
+#include <QDir>
+#include <QTextStream>
 #include "global.h"
 #include "client.h"
 #include "server.h"
diff --git a/src/socket.h b/src/socket.h
index b6af6f41..31ae8bb3 100755
--- a/src/socket.h
+++ b/src/socket.h
@@ -25,11 +25,11 @@
 #if !defined ( SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_ )
 #define SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_
 
-#include <qobject.h>
-#include <qmessagebox.h>
-#include <qudpsocket.h>
-#include <qsocketnotifier.h>
-#include <qmutex.h>
+#include <QObject>
+#include <QMessageBox>
+#include <QUdpSocket>
+#include <QSocketNotifier>
+#include <QMutex>
 #include <vector>
 #include "global.h"
 #include "channel.h"
diff --git a/src/soundbase.h b/src/soundbase.h
index d23fb61f..164ffe02 100755
--- a/src/soundbase.h
+++ b/src/soundbase.h
@@ -25,9 +25,9 @@
 #if !defined ( SOUNDBASE_HOIHGEH8_3_4344456456345634565KJIUHF1912__INCLUDED_ )
 #define SOUNDBASE_HOIHGEH8_3_4344456456345634565KJIUHF1912__INCLUDED_
 
-#include <qthread.h>
-#include <qstring.h>
-#include <qmessagebox.h>
+#include <QThread>
+#include <QString>
+#include <QMessageBox>
 #include "global.h"
 #include "util.h"
 
diff --git a/src/testbench.h b/src/testbench.h
index 276c2576..7d3ca691 100755
--- a/src/testbench.h
+++ b/src/testbench.h
@@ -25,10 +25,10 @@
 #if !defined ( TESTBENCH_HOIHJH8_3_43445KJIUHF1912__INCLUDED_ )
 #define TESTBENCH_HOIHJH8_3_43445KJIUHF1912__INCLUDED_
 
-#include <qobject.h>
-#include <qtimer.h>
-#include <qdatetime.h>
-#include <qhostaddress.h>
+#include <QObject>
+#include <QTimer>
+#include <QDateTime>
+#include <QHostAddress>
 #include "global.h"
 #include "socket.h"
 #include "protocol.h"
diff --git a/src/util.h b/src/util.h
index 767f84eb..db93b361 100755
--- a/src/util.h
+++ b/src/util.h
@@ -25,17 +25,17 @@
 #if !defined ( UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_ )
 #define UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_
 
-#include <qhostaddress.h>
-#include <qhostinfo.h>
-#include <qmenu.h>
-#include <qwhatsthis.h>
-#include <qtextbrowser.h>
-#include <qlabel.h>
-#include <qdatetime.h>
-#include <qfile.h>
-#include <qdesktopservices.h>
-#include <qurl.h>
-#include <qlocale.h>
+#include <QHostAddress>
+#include <QHostInfo>
+#include <QMenu>
+#include <QWhatsThis>
+#include <QTextBrowser>
+#include <QLabel>
+#include <QDateTime>
+#include <QFile>
+#include <QDesktopServices>
+#include <QUrl>
+#include <QLocale>
 #include <vector>
 #include "global.h"
 using namespace std; // because of the library: "vector"
diff --git a/windows/sound.h b/windows/sound.h
index 3b3e1830..b35a4712 100755
--- a/windows/sound.h
+++ b/windows/sound.h
@@ -26,8 +26,8 @@
 #define _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_
 
 #include <windows.h>
-#include <qmutex.h>
-#include <qmessagebox.h>
+#include <QMutex>
+#include <QMessagebox>
 #include "../src/util.h"
 #include "../src/global.h"
 #include "../src/soundbase.h"