diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index 8dbf1dcf..fb6eb336 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "configfile.h"
+ *****************************************************************************/
+#include "configfile.h"
 #include <qttoolsinterface.h>
 #include <core/loghelper.h>
 #include <tinyxml.h>
diff --git a/src/config/configfile.h b/src/config/configfile.h
index 09aa104e..f48cd20e 100644
--- a/src/config/configfile.h
+++ b/src/config/configfile.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef CONFIGFILE_H
+ *****************************************************************************/
+#ifndef CONFIGFILE_H
 #define CONFIGFILE_H
 
 #include <vector>
diff --git a/src/engine/berointerface.h b/src/engine/berointerface.h
index 9fdfd95f..a0ec5a33 100644
--- a/src/engine/berointerface.h
+++ b/src/engine/berointerface.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef BEROINTERFACE_H
+ *****************************************************************************/
+#ifndef BEROINTERFACE_H
 #define BEROINTERFACE_H
 
 #include <game_defs.h>
diff --git a/src/engine/boardinterface.h b/src/engine/boardinterface.h
index 80245023..958f0a97 100644
--- a/src/engine/boardinterface.h
+++ b/src/engine/boardinterface.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef BOARDINTERFACE_H
+ *****************************************************************************/
+#ifndef BOARDINTERFACE_H
 #define BOARDINTERFACE_H
 
 #include <engine_defs.h>
diff --git a/src/engine/enginefactory.h b/src/engine/enginefactory.h
index 830def07..db325206 100644
--- a/src/engine/enginefactory.h
+++ b/src/engine/enginefactory.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef ENGINEFACTORY_H
+ *****************************************************************************/
+#ifndef ENGINEFACTORY_H
 #define ENGINEFACTORY_H
 
 #include "boardinterface.h"
diff --git a/src/engine/handinterface.h b/src/engine/handinterface.h
index 6fb44cca..b6511f35 100644
--- a/src/engine/handinterface.h
+++ b/src/engine/handinterface.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef HANDINTERFACE_H
+ *****************************************************************************/
+#ifndef HANDINTERFACE_H
 #define HANDINTERFACE_H
 
 #include "guiinterface.h"
diff --git a/src/engine/playerinterface.h b/src/engine/playerinterface.h
index 9e1a7daa..928e2ca7 100644
--- a/src/engine/playerinterface.h
+++ b/src/engine/playerinterface.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef PLAYERINTERFACE_H
+ *****************************************************************************/
+#ifndef PLAYERINTERFACE_H
 #define PLAYERINTERFACE_H
 
 #include "handinterface.h"
diff --git a/src/gui/generic/serverguiwrapper.h b/src/gui/generic/serverguiwrapper.h
index df9f5e34..c81318f8 100644
--- a/src/gui/generic/serverguiwrapper.h
+++ b/src/gui/generic/serverguiwrapper.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef SERVERGUIWRAPPER_H
+ *****************************************************************************/
+#ifndef SERVERGUIWRAPPER_H
 #define SERVERGUIWRAPPER_H
 
 #include <guiinterface.h>
diff --git a/src/gui/guiinterface.cpp b/src/gui/guiinterface.cpp
index a17c944e..86d845bb 100644
--- a/src/gui/guiinterface.cpp
+++ b/src/gui/guiinterface.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "guiinterface.h"
+ *****************************************************************************/
+#include "guiinterface.h"
 
 GuiInterface::~GuiInterface()
 {
diff --git a/src/gui/guiinterface.h b/src/gui/guiinterface.h
index b2470bd3..9e4b68d0 100644
--- a/src/gui/guiinterface.h
+++ b/src/gui/guiinterface.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef GUIINTERFACE_H
+ *****************************************************************************/
+#ifndef GUIINTERFACE_H
 #define GUIINTERFACE_H
 
 #include <net/clientcallback.h>
diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
index 1b3c852b..3173f3e3 100755
--- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
+++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "aboutpokerthimpl.h"
+ *****************************************************************************/
+#include "aboutpokerthimpl.h"
 #include "configfile.h"
 #include "game_defs.h"
 #include <QtCore>
diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.h b/src/gui/qt/aboutpokerth/aboutpokerthimpl.h
index fc99d8a2..91f977ce 100755
--- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.h
+++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef ABOUTPOKERTHIMPL_H
+ *****************************************************************************/
+#ifndef ABOUTPOKERTHIMPL_H
 #define ABOUTPOKERTHIMPL_H
 
 #include "ui_aboutpokerth.h"
diff --git a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
index 54be8f18..520466d7 100644
--- a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
+++ b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "changecompleteblindsdialogimpl.h"
+ *****************************************************************************/
+#include "changecompleteblindsdialogimpl.h"
 #include "configfile.h"
 #include <iostream>
 
diff --git a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h
index aa560f40..8ddc806c 100644
--- a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h
+++ b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef CHANGECOMPLETEBLINDSDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef CHANGECOMPLETEBLINDSDIALOGIMPL_H
 #define CHANGECOMPLETEBLINDSDIALOGIMPL_H
 
 #include "ui_changecompleteblindsdialog.h"
diff --git a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp
index d794b093..4654dc30 100644
--- a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp
+++ b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "changecontentdialogimpl.h"
+ *****************************************************************************/
+#include "changecontentdialogimpl.h"
 // #include "session.h"
 #include "configfile.h"
 
diff --git a/src/gui/qt/changecontentdialog/changecontentdialogimpl.h b/src/gui/qt/changecontentdialog/changecontentdialogimpl.h
index 30de2d44..cdb2c7fc 100644
--- a/src/gui/qt/changecontentdialog/changecontentdialogimpl.h
+++ b/src/gui/qt/changecontentdialog/changecontentdialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef CHANGECONTENTDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef CHANGECONTENTDIALOGIMPL_H
 #define CHANGECONTENTDIALOGIMPL_H
 
 #include "ui_changecontentdialog.h"
diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp
index 8823b05e..0e50a4be 100644
--- a/src/gui/qt/chattools/chattools.cpp
+++ b/src/gui/qt/chattools/chattools.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "chattools.h"
+ *****************************************************************************/
+#include "chattools.h"
 #include "session.h"
 #include "configfile.h"
 #include "gametablestylereader.h"
diff --git a/src/gui/qt/chattools/chattools.h b/src/gui/qt/chattools/chattools.h
index e7cd6228..ea3f75c4 100644
--- a/src/gui/qt/chattools/chattools.h
+++ b/src/gui/qt/chattools/chattools.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef CHATTOOLS_H
+ *****************************************************************************/
+#ifndef CHATTOOLS_H
 #define CHATTOOLS_H
 
 #include <string>
diff --git a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
index 4d63a62b..f235070c 100644
--- a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
+++ b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "connecttoserverdialogimpl.h"
+ *****************************************************************************/
+#include "connecttoserverdialogimpl.h"
 #include <net/socket_msg.h>
 
 connectToServerDialogImpl::connectToServerDialogImpl(QWidget *parent)
diff --git a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h
index 05c93588..eeb598b0 100644
--- a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h
+++ b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef CONNECTTOSERVERDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef CONNECTTOSERVERDIALOGIMPL_H
 #define CONNECTTOSERVERDIALOGIMPL_H
 
 #include "ui_connecttoserverdialog.h"
diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
index 695012e5..a7e0e01f 100644
--- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
+++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "createinternetgamedialogimpl.h"
+ *****************************************************************************/
+#include "createinternetgamedialogimpl.h"
 #include "session.h"
 #include "configfile.h"
 #include "gamedata.h"
diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.h b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.h
index d202db50..16d6b835 100644
--- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.h
+++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef CREATEINTERNETGAMEDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef CREATEINTERNETGAMEDIALOGIMPL_H
 #define CREATEINTERNETGAMEDIALOGIMPL_H
 
 #include "ui_createinternetgamedialog.h"
diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
index 07a563ad..b3d58cc5 100644
--- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "createnetworkgamedialogimpl.h"
+ *****************************************************************************/
+#include "createnetworkgamedialogimpl.h"
 #include "session.h"
 #include "configfile.h"
 #include "changecompleteblindsdialogimpl.h"
diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h
index 96945a9f..627fcf8b 100644
--- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h
+++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef CREATENETWORKGAMEDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef CREATENETWORKGAMEDIALOGIMPL_H
 #define CREATENETWORKGAMEDIALOGIMPL_H
 
 #include "ui_createnetworkgamedialog.h"
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index cae16ad5..d49f6dc1 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "gamelobbydialogimpl.h"
+ *****************************************************************************/
+#include "gamelobbydialogimpl.h"
 #include "mygamelistsortfilterproxymodel.h"
 #include "mynicklistsortfilterproxymodel.h"
 #include "startwindowimpl.h"
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
index 58c27c19..2e10e39e 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef GAMELOBBYDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef GAMELOBBYDIALOGIMPL_H
 #define GAMELOBBYDIALOGIMPL_H
 
 #include <ui_gamelobbydialog.h>
diff --git a/src/gui/qt/gamelobbydialog/mygamelisttreewidget.cpp b/src/gui/qt/gamelobbydialog/mygamelisttreewidget.cpp
index 36bd0baf..1632cba7 100644
--- a/src/gui/qt/gamelobbydialog/mygamelisttreewidget.cpp
+++ b/src/gui/qt/gamelobbydialog/mygamelisttreewidget.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "mygamelisttreewidget.h"
+ *****************************************************************************/
+#include "mygamelisttreewidget.h"
 #include <QDebug>
 #include <iostream>
 
diff --git a/src/gui/qt/gamelobbydialog/mygamelisttreewidget.h b/src/gui/qt/gamelobbydialog/mygamelisttreewidget.h
index 5b228e39..2ef49c37 100644
--- a/src/gui/qt/gamelobbydialog/mygamelisttreewidget.h
+++ b/src/gui/qt/gamelobbydialog/mygamelisttreewidget.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYGAMELISTTREEWIDGET_H
+ *****************************************************************************/
+#ifndef MYGAMELISTTREEWIDGET_H
 #define MYGAMELISTTREEWIDGET_H
 
 #include <QtGui>
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 59bd7313..cdc1d4c2 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "gametableimpl.h"
+ *****************************************************************************/
+#include "gametableimpl.h"
 
 #include "mymessagedialogimpl.h"
 #include "settingsdialogimpl.h"
diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h
index d688b2f7..267225b7 100755
--- a/src/gui/qt/gametable/gametableimpl.h
+++ b/src/gui/qt/gametable/gametableimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef GAMETABLEIMPL_H
+ *****************************************************************************/
+#ifndef GAMETABLEIMPL_H
 #define GAMETABLEIMPL_H
 
 #include "ui_gametable.h"
diff --git a/src/gui/qt/gametable/log/guilog.cpp b/src/gui/qt/gametable/log/guilog.cpp
index 689e69a5..2fba454f 100644
--- a/src/gui/qt/gametable/log/guilog.cpp
+++ b/src/gui/qt/gametable/log/guilog.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "guilog.h"
+ *****************************************************************************/
+#include "guilog.h"
 
 #include "gametableimpl.h"
 #include <handinterface.h>
diff --git a/src/gui/qt/gametable/log/guilog.h b/src/gui/qt/gametable/log/guilog.h
index 832fd19c..8284a9dc 100644
--- a/src/gui/qt/gametable/log/guilog.h
+++ b/src/gui/qt/gametable/log/guilog.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef GUILOG_H
+ *****************************************************************************/
+#ifndef GUILOG_H
 #define GUILOG_H
 
 #include <fstream>
diff --git a/src/gui/qt/gametable/myactionbutton.cpp b/src/gui/qt/gametable/myactionbutton.cpp
index 5b1b5dcc..afeb45c5 100644
--- a/src/gui/qt/gametable/myactionbutton.cpp
+++ b/src/gui/qt/gametable/myactionbutton.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "myactionbutton.h"
+ *****************************************************************************/
+#include "myactionbutton.h"
 #include "gametablestylereader.h"
 
 using namespace std;
diff --git a/src/gui/qt/gametable/myactionbutton.h b/src/gui/qt/gametable/myactionbutton.h
index 096224ed..faf57c2b 100644
--- a/src/gui/qt/gametable/myactionbutton.h
+++ b/src/gui/qt/gametable/myactionbutton.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYACTIONBUTTON_H
+ *****************************************************************************/
+#ifndef MYACTIONBUTTON_H
 #define MYACTIONBUTTON_H
 
 #include <QtGui>
diff --git a/src/gui/qt/gametable/myavatarlabel.cpp b/src/gui/qt/gametable/myavatarlabel.cpp
index 17ec1d38..07b967cd 100644
--- a/src/gui/qt/gametable/myavatarlabel.cpp
+++ b/src/gui/qt/gametable/myavatarlabel.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "myavatarlabel.h"
+ *****************************************************************************/
+#include "myavatarlabel.h"
 
 #include "gametableimpl.h"
 #include "gametablestylereader.h"
diff --git a/src/gui/qt/gametable/myavatarlabel.h b/src/gui/qt/gametable/myavatarlabel.h
index 7c07559f..450f7c2d 100644
--- a/src/gui/qt/gametable/myavatarlabel.h
+++ b/src/gui/qt/gametable/myavatarlabel.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYAVATARLABEL_H
+ *****************************************************************************/
+#ifndef MYAVATARLABEL_H
 #define MYAVATARLABEL_H
 
 #include <iostream>
diff --git a/src/gui/qt/gametable/mycardspixmaplabel.cpp b/src/gui/qt/gametable/mycardspixmaplabel.cpp
index ba94b782..7dbfd2fb 100755
--- a/src/gui/qt/gametable/mycardspixmaplabel.cpp
+++ b/src/gui/qt/gametable/mycardspixmaplabel.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "mycardspixmaplabel.h"
+ *****************************************************************************/
+#include "mycardspixmaplabel.h"
 #include "gametableimpl.h"
 // using namespace std;
 
diff --git a/src/gui/qt/gametable/mycardspixmaplabel.h b/src/gui/qt/gametable/mycardspixmaplabel.h
index 819df318..9011b36c 100755
--- a/src/gui/qt/gametable/mycardspixmaplabel.h
+++ b/src/gui/qt/gametable/mycardspixmaplabel.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYCARDSPIXMAPLABEL_H
+ *****************************************************************************/
+#ifndef MYCARDSPIXMAPLABEL_H
 #define MYCARDSPIXMAPLABEL_H
 
 #include <iostream>
diff --git a/src/gui/qt/gametable/mychancelabel.cpp b/src/gui/qt/gametable/mychancelabel.cpp
index 42cd3b42..c6959bbc 100644
--- a/src/gui/qt/gametable/mychancelabel.cpp
+++ b/src/gui/qt/gametable/mychancelabel.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "mychancelabel.h"
+ *****************************************************************************/
+#include "mychancelabel.h"
 #include "gametableimpl.h"
 #include "gametablestylereader.h"
 
diff --git a/src/gui/qt/gametable/mychancelabel.h b/src/gui/qt/gametable/mychancelabel.h
index 9dbfb342..4cd0af63 100644
--- a/src/gui/qt/gametable/mychancelabel.h
+++ b/src/gui/qt/gametable/mychancelabel.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYCHANCELABEL_H
+ *****************************************************************************/
+#ifndef MYCHANCELABEL_H
 #define MYCHANCELABEL_H
 
 #include <vector>
diff --git a/src/gui/qt/gametable/mylefttabwidget.cpp b/src/gui/qt/gametable/mylefttabwidget.cpp
index f5796cd7..2143fad5 100755
--- a/src/gui/qt/gametable/mylefttabwidget.cpp
+++ b/src/gui/qt/gametable/mylefttabwidget.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "mylefttabwidget.h"
+ *****************************************************************************/
+#include "mylefttabwidget.h"
 
 MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent)
 	: QTabWidget(parent), chatBlinkTimer(0), myTabBar(0)
diff --git a/src/gui/qt/gametable/mylefttabwidget.h b/src/gui/qt/gametable/mylefttabwidget.h
index 1cb05fb4..d543a37c 100755
--- a/src/gui/qt/gametable/mylefttabwidget.h
+++ b/src/gui/qt/gametable/mylefttabwidget.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYLEFTTABWIDGET_H
+ *****************************************************************************/
+#ifndef MYLEFTTABWIDGET_H
 #define MYLEFTTABWIDGET_H
 
 #include <QtGui>
diff --git a/src/gui/qt/gametable/mynamelabel.cpp b/src/gui/qt/gametable/mynamelabel.cpp
index a200fe6f..e741f4af 100644
--- a/src/gui/qt/gametable/mynamelabel.cpp
+++ b/src/gui/qt/gametable/mynamelabel.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "mynamelabel.h"
+ *****************************************************************************/
+#include "mynamelabel.h"
 #include "gametableimpl.h"
 #include "session.h"
 #include "gametablestylereader.h"
diff --git a/src/gui/qt/gametable/mynamelabel.h b/src/gui/qt/gametable/mynamelabel.h
index b498cf22..fd3984ba 100644
--- a/src/gui/qt/gametable/mynamelabel.h
+++ b/src/gui/qt/gametable/mynamelabel.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYNAMELABEL_H
+ *****************************************************************************/
+#ifndef MYNAMELABEL_H
 #define MYNAMELABEL_H
 
 #include <iostream>
diff --git a/src/gui/qt/gametable/myrighttabwidget.cpp b/src/gui/qt/gametable/myrighttabwidget.cpp
index fdb821c5..b7533d36 100755
--- a/src/gui/qt/gametable/myrighttabwidget.cpp
+++ b/src/gui/qt/gametable/myrighttabwidget.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "myrighttabwidget.h"
+ *****************************************************************************/
+#include "myrighttabwidget.h"
 #include <iostream>
 
 using namespace std;
diff --git a/src/gui/qt/gametable/myrighttabwidget.h b/src/gui/qt/gametable/myrighttabwidget.h
index c9f6db88..688344e3 100755
--- a/src/gui/qt/gametable/myrighttabwidget.h
+++ b/src/gui/qt/gametable/myrighttabwidget.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYRIGHTTABWIDGET_H
+ *****************************************************************************/
+#ifndef MYRIGHTTABWIDGET_H
 #define MYRIGHTTABWIDGET_H
 
 #include <QtGui>
diff --git a/src/gui/qt/gametable/mysetlabel.cpp b/src/gui/qt/gametable/mysetlabel.cpp
index ad0a6532..f4212258 100755
--- a/src/gui/qt/gametable/mysetlabel.cpp
+++ b/src/gui/qt/gametable/mysetlabel.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "mysetlabel.h"
+ *****************************************************************************/
+#include "mysetlabel.h"
 
 #include "gametableimpl.h"
 
diff --git a/src/gui/qt/gametable/mysetlabel.h b/src/gui/qt/gametable/mysetlabel.h
index f186c8f8..c78c3773 100644
--- a/src/gui/qt/gametable/mysetlabel.h
+++ b/src/gui/qt/gametable/mysetlabel.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYSETLABEL_H
+ *****************************************************************************/
+#ifndef MYSETLABEL_H
 #define MYSETLABEL_H
 
 #include <iostream>
diff --git a/src/gui/qt/gametable/mystatuslabel.cpp b/src/gui/qt/gametable/mystatuslabel.cpp
index e83d572a..98a03050 100755
--- a/src/gui/qt/gametable/mystatuslabel.cpp
+++ b/src/gui/qt/gametable/mystatuslabel.cpp
@@ -14,8 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "mysetlabel.h"
-
+ *****************************************************************************/
+#include "mysetlabel.h"
 #include "gametableimpl.h"
 
 using namespace std;
diff --git a/src/gui/qt/gametable/mystatuslabel.h b/src/gui/qt/gametable/mystatuslabel.h
index aa852391..bad2a7b7 100755
--- a/src/gui/qt/gametable/mystatuslabel.h
+++ b/src/gui/qt/gametable/mystatuslabel.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYSTATUSLABEL_H
+ *****************************************************************************/
+#ifndef MYSTATUSLABEL_H
 #define MYSTATUSLABEL_H
 
 #include <iostream>
diff --git a/src/gui/qt/gametable/mytimeoutlabel.cpp b/src/gui/qt/gametable/mytimeoutlabel.cpp
index a58c2901..e37839fe 100644
--- a/src/gui/qt/gametable/mytimeoutlabel.cpp
+++ b/src/gui/qt/gametable/mytimeoutlabel.cpp
@@ -14,8 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "mytimeoutlabel.h"
-
+ *****************************************************************************/
+#include "mytimeoutlabel.h"
 #include "gametableimpl.h"
 
 using namespace std;
diff --git a/src/gui/qt/gametable/mytimeoutlabel.h b/src/gui/qt/gametable/mytimeoutlabel.h
index 25242e2a..fde53e07 100644
--- a/src/gui/qt/gametable/mytimeoutlabel.h
+++ b/src/gui/qt/gametable/mytimeoutlabel.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYTIMEOUTLABEL_H
+ *****************************************************************************/
+#ifndef MYTIMEOUTLABEL_H
 #define MYTIMEOUTLABEL_H
 
 #include <iostream>
diff --git a/src/gui/qt/gametable/startsplash/startsplash.cpp b/src/gui/qt/gametable/startsplash/startsplash.cpp
index 383b291a..d335bbf4 100755
--- a/src/gui/qt/gametable/startsplash/startsplash.cpp
+++ b/src/gui/qt/gametable/startsplash/startsplash.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "startsplash.h"
+ *****************************************************************************/
+#include "startsplash.h"
 
 StartSplash::StartSplash(QPixmap &p)
 	: QSplashScreen(p)
diff --git a/src/gui/qt/gametable/startsplash/startsplash.h b/src/gui/qt/gametable/startsplash/startsplash.h
index 03dd5cf2..9c2d2ce9 100755
--- a/src/gui/qt/gametable/startsplash/startsplash.h
+++ b/src/gui/qt/gametable/startsplash/startsplash.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef STARTSPLASH_H
+ *****************************************************************************/
+#ifndef STARTSPLASH_H
 #define STARTSPLASH_H
 
 #include <QtGui>
diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h
index 1c5aeb4d..5503cdfc 100644
--- a/src/gui/qt/guiwrapper.h
+++ b/src/gui/qt/guiwrapper.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef GUIWRAPPER_H
+ *****************************************************************************/
+#ifndef GUIWRAPPER_H
 #define GUIWRAPPER_H
 
 #include <guiinterface.h>
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
index 8963c1bf..8dcb0d32 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "joinnetworkgamedialogimpl.h"
+ *****************************************************************************/
+#include "joinnetworkgamedialogimpl.h"
 #include "session.h"
 #include "configfile.h"
 #include <tinyxml.h>
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
index bb3d70fc..ac0e8c1a 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef JOINNETWORKGAMEDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef JOINNETWORKGAMEDIALOGIMPL_H
 #define JOINNETWORKGAMEDIALOGIMPL_H
 
 #include "ui_joinnetworkgamedialog.h"
diff --git a/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp b/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp
index b87e27a6..3eadfac8 100644
--- a/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp
+++ b/src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp
@@ -14,8 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "mymessagedialogimpl.h"
-
+ *****************************************************************************/
+#include "mymessagedialogimpl.h"
 #include <QtCore>
 #include "configfile.h"
 #include <iostream>
diff --git a/src/gui/qt/mymessagedialog/mymessagedialogimpl.h b/src/gui/qt/mymessagedialog/mymessagedialogimpl.h
index d53c60a6..2a8c568d 100644
--- a/src/gui/qt/mymessagedialog/mymessagedialogimpl.h
+++ b/src/gui/qt/mymessagedialog/mymessagedialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYMESSAGEDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef MYMESSAGEDIALOGIMPL_H
 #define MYMESSAGEDIALOGIMPL_H
 
 #include "ui_mymessagedialog.h"
diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
index 906be081..303d76ce 100755
--- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
+++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "newgamedialogimpl.h"
+ *****************************************************************************/
+#include "newgamedialogimpl.h"
 #include "changecompleteblindsdialogimpl.h"
 #include "configfile.h"
 
diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h
index caa8b1ed..2a6e9553 100755
--- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h
+++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef NEWGAMEDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef NEWGAMEDIALOGIMPL_H
 #define NEWGAMEDIALOGIMPL_H
 
 #include "ui_newgamedialog.h"
diff --git a/src/gui/qt/qttools/qthelper/qthelper.cpp b/src/gui/qt/qttools/qthelper/qthelper.cpp
index d76dbb40..96d29127 100644
--- a/src/gui/qt/qttools/qthelper/qthelper.cpp
+++ b/src/gui/qt/qttools/qthelper/qthelper.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "qthelper.h"
+ *****************************************************************************/
+#include "qthelper.h"
 #include <QtCore>
 #include <iostream>
 
diff --git a/src/gui/qt/qttools/qthelper/qthelper.h b/src/gui/qt/qttools/qthelper/qthelper.h
index 41211eac..a91734a3 100644
--- a/src/gui/qt/qttools/qthelper/qthelper.h
+++ b/src/gui/qt/qttools/qthelper/qthelper.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef QTHELPER_H
+ *****************************************************************************/
+#ifndef QTHELPER_H
 #define QTHELPER_H
 
 #ifdef POKERTH_DEDICATED_SERVER
diff --git a/src/gui/qt/qttools/qttoolswrapper.cpp b/src/gui/qt/qttools/qttoolswrapper.cpp
index af17508f..1b2a7c7f 100644
--- a/src/gui/qt/qttools/qttoolswrapper.cpp
+++ b/src/gui/qt/qttools/qttoolswrapper.cpp
@@ -16,10 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
  *****************************************************************************/
 #include "qttoolswrapper.h"
-
 #include <qthelper/qthelper.h>
 
-
 using namespace std;
 
 
diff --git a/src/gui/qt/qttools/qttoolswrapper.h b/src/gui/qt/qttools/qttoolswrapper.h
index 5d0e2df2..50e19d63 100644
--- a/src/gui/qt/qttools/qttoolswrapper.h
+++ b/src/gui/qt/qttools/qttoolswrapper.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef QTTOOLSWRAPPER_H
+ *****************************************************************************/
+#ifndef QTTOOLSWRAPPER_H
 #define QTTOOLSWRAPPER_H
 
 #include <qttoolsinterface.h>
diff --git a/src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp b/src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp
index 13e065db..e95fe1bd 100644
--- a/src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp
+++ b/src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "serverlistdialogimpl.h"
+ *****************************************************************************/
+#include "serverlistdialogimpl.h"
 #include "configfile.h"
 #include "startwindowimpl.h"
 #include "connecttoserverdialogimpl.h"
diff --git a/src/gui/qt/serverlistdialog/serverlistdialogimpl.h b/src/gui/qt/serverlistdialog/serverlistdialogimpl.h
index f480f313..01bc382e 100644
--- a/src/gui/qt/serverlistdialog/serverlistdialogimpl.h
+++ b/src/gui/qt/serverlistdialog/serverlistdialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef SERVERLISTDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef SERVERLISTDIALOGIMPL_H
 #define SERVERLISTDIALOGIMPL_H
 
 #include "ui_serverlistdialog.h"
diff --git a/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp b/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
index 0a084305..75d579d0 100644
--- a/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "manualblindsorderdialogimpl.h"
+ *****************************************************************************/
+#include "manualblindsorderdialogimpl.h"
 #include "configfile.h"
 #include <iostream>
 
diff --git a/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.h b/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.h
index a3eb1275..27d50d81 100644
--- a/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.h
+++ b/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MANUALBLINDSORDERDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef MANUALBLINDSORDERDIALOGIMPL_H
 #define MANUALBLINDSORDERDIALOGIMPL_H
 
 #include "ui_manualblindsorderdialog.h"
diff --git a/src/gui/qt/settingsdialog/myavatarbutton.cpp b/src/gui/qt/settingsdialog/myavatarbutton.cpp
index 569632a1..214ddd0e 100644
--- a/src/gui/qt/settingsdialog/myavatarbutton.cpp
+++ b/src/gui/qt/settingsdialog/myavatarbutton.cpp
@@ -14,8 +14,9 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "myavatarbutton.h"
+ *****************************************************************************/
 
+#include "myavatarbutton.h"
 
 using namespace std;
 
diff --git a/src/gui/qt/settingsdialog/myavatarbutton.h b/src/gui/qt/settingsdialog/myavatarbutton.h
index 9f6d23d8..1acef955 100644
--- a/src/gui/qt/settingsdialog/myavatarbutton.h
+++ b/src/gui/qt/settingsdialog/myavatarbutton.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYAVATARBUTTON_H
+ *****************************************************************************/
+#ifndef MYAVATARBUTTON_H
 #define MYAVATARBUTTON_H
 
 #include <QtGui>
diff --git a/src/gui/qt/settingsdialog/myhpavatarbutton.cpp b/src/gui/qt/settingsdialog/myhpavatarbutton.cpp
index 485f4523..de50bf74 100644
--- a/src/gui/qt/settingsdialog/myhpavatarbutton.cpp
+++ b/src/gui/qt/settingsdialog/myhpavatarbutton.cpp
@@ -14,8 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "myhpavatarbutton.h"
-
+ *****************************************************************************/
+#include "myhpavatarbutton.h"
 
 using namespace std;
 
diff --git a/src/gui/qt/settingsdialog/myhpavatarbutton.h b/src/gui/qt/settingsdialog/myhpavatarbutton.h
index 118b3f34..7bbe48bf 100644
--- a/src/gui/qt/settingsdialog/myhpavatarbutton.h
+++ b/src/gui/qt/settingsdialog/myhpavatarbutton.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYHPAVATARBUTTON_H
+ *****************************************************************************/
+#ifndef MYHPAVATARBUTTON_H
 #define MYHPAVATARBUTTON_H
 
 #include <QtGui>
diff --git a/src/gui/qt/settingsdialog/mystylelistitem.cpp b/src/gui/qt/settingsdialog/mystylelistitem.cpp
index d9a15b16..2f2c5c16 100644
--- a/src/gui/qt/settingsdialog/mystylelistitem.cpp
+++ b/src/gui/qt/settingsdialog/mystylelistitem.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "mystylelistitem.h"
+ *****************************************************************************/
+#include "mystylelistitem.h"
 
 MyStyleListItem::MyStyleListItem(QStringList s, QTreeWidget *w)
 	: QTreeWidgetItem(w, s, QTreeWidgetItem::UserType)
diff --git a/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp
index 2fb2b46c..3e1e6740 100644
--- a/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp
+++ b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "myavatarlistitem.h"
+ *****************************************************************************/
+#include "myavatarlistitem.h"
 
 using namespace std;
 
diff --git a/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h
index 17538ac2..effa1c3c 100644
--- a/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h
+++ b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef MYAVATARLISTITEM_H
+ *****************************************************************************/
+#ifndef MYAVATARLISTITEM_H
 #define MYAVATARLISTITEM_H
 
 #include <QtGui>
diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
index 0165c897..b363d335 100644
--- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "selectavatardialogimpl.h"
+ *****************************************************************************/
+#include "selectavatardialogimpl.h"
 #include "myavatarlistitem.h"
 #include "configfile.h"
 #include <iostream>
diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h
index addde6eb..3f4a8c05 100644
--- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h
+++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef SELECTAVATARDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef SELECTAVATARDIALOGIMPL_H
 #define SELECTAVATARDIALOGIMPL_H
 
 #include "ui_selectavatardialog.h"
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 2a688fe1..c5ea2343 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "settingsdialogimpl.h"
+ *****************************************************************************/
+#include "settingsdialogimpl.h"
 #include "myavatarlistitem.h"
 #include "mystylelistitem.h"
 #include "gametablestylereader.h"
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h
index 9d85fc16..c4e00c04 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.h
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef SETTINGSDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef SETTINGSDIALOGIMPL_H
 #define SETTINGSDIALOGIMPL_H
 
 #include "ui_settingsdialog.h"
diff --git a/src/gui/qt/sound/sdlplayer.cpp b/src/gui/qt/sound/sdlplayer.cpp
index 3f982114..8241fa99 100644
--- a/src/gui/qt/sound/sdlplayer.cpp
+++ b/src/gui/qt/sound/sdlplayer.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "sdlplayer.h"
+ *****************************************************************************/
+#include "sdlplayer.h"
 
 #if (defined __APPLE__)
 #include <SDL.h>
diff --git a/src/gui/qt/sound/sdlplayer.h b/src/gui/qt/sound/sdlplayer.h
index f1fb0106..8afe2a45 100644
--- a/src/gui/qt/sound/sdlplayer.h
+++ b/src/gui/qt/sound/sdlplayer.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include <QtCore>
+ *****************************************************************************/
+#include <QtCore>
 
 #ifndef SDLPLAYER_H
 #define SDLPLAYER_H
diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp
index 72b439e0..6bbb779f 100644
--- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "startnetworkgamedialogimpl.h"
+ *****************************************************************************/
+#include "startnetworkgamedialogimpl.h"
 #include "startwindowimpl.h"
 #include "session.h"
 #include "configfile.h"
diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h
index d1782eb3..81755643 100644
--- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h
+++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef STARTNETWORKGAMEDIALOGIMPL_H
+ *****************************************************************************/
+#ifndef STARTNETWORKGAMEDIALOGIMPL_H
 #define STARTNETWORKGAMEDIALOGIMPL_H
 
 #include "ui_startnetworkgamedialog.h"
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index 2055ed66..185a5aad 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -14,19 +14,16 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "startwindowimpl.h"
-
+ *****************************************************************************/
+#include "startwindowimpl.h"
 #include "playerinterface.h"
-
 #include <gamedata.h>
 #include <generic/serverguiwrapper.h>
 #include <net/socket_msg.h>
 #include "tools.h"
-
 #include "session.h"
 #include "game.h"
 #include "guiwrapper.h"
-
 #include "configfile.h"
 #include "gametableimpl.h"
 #include "newgamedialogimpl.h"
diff --git a/src/gui/qt/startwindow/startwindowimpl.h b/src/gui/qt/startwindow/startwindowimpl.h
index c32112fa..96efbea4 100644
--- a/src/gui/qt/startwindow/startwindowimpl.h
+++ b/src/gui/qt/startwindow/startwindowimpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef STARTWINDOWIMPL_H
+ *****************************************************************************/
+#ifndef STARTWINDOWIMPL_H
 #define STARTWINDOWIMPL_H
 
 #include <boost/shared_ptr.hpp>
diff --git a/src/gui/qt/styles/carddeckstylereader.cpp b/src/gui/qt/styles/carddeckstylereader.cpp
index bffaf425..b13fa62c 100644
--- a/src/gui/qt/styles/carddeckstylereader.cpp
+++ b/src/gui/qt/styles/carddeckstylereader.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "carddeckstylereader.h"
+ *****************************************************************************/
+#include "carddeckstylereader.h"
 #include <iostream>
 #include <sstream>
 #include <cstdlib>
diff --git a/src/gui/qt/styles/carddeckstylereader.h b/src/gui/qt/styles/carddeckstylereader.h
index cf98b3a2..132a01cd 100644
--- a/src/gui/qt/styles/carddeckstylereader.h
+++ b/src/gui/qt/styles/carddeckstylereader.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef CARDDECKSTYLEREADER_H
+ *****************************************************************************/
+#ifndef CARDDECKSTYLEREADER_H
 #define CARDDECKSTYLEREADER_H
 
 #include <tinyxml.h>
diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp
index 545669d3..9a71db0d 100644
--- a/src/gui/qt/styles/gametablestylereader.cpp
+++ b/src/gui/qt/styles/gametablestylereader.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "gametablestylereader.h"
+ *****************************************************************************/
+#include "gametablestylereader.h"
 #include <cstdlib>
 
 using namespace std;
diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h
index 968daccd..51793fb0 100644
--- a/src/gui/qt/styles/gametablestylereader.h
+++ b/src/gui/qt/styles/gametablestylereader.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef GAMETABLESTYLEREADER_H
+ *****************************************************************************/
+#ifndef GAMETABLESTYLEREADER_H
 #define GAMETABLESTYLEREADER_H
 
 #include <tinyxml.h>
diff --git a/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.cpp b/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.cpp
index a7d6d5c6..ceb63d2a 100644
--- a/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.cpp
+++ b/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "timeoutmsgboximpl.h"
+ *****************************************************************************/
+#include "timeoutmsgboximpl.h"
 #include "session.h"
 
 timeoutMsgBoxImpl::timeoutMsgBoxImpl(QMainWindow *parent)
diff --git a/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h b/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h
index a5f98fbe..45b1bfb8 100644
--- a/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h
+++ b/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef TIMEOUTMSGBOXIMPL_H
+ *****************************************************************************/
+#ifndef TIMEOUTMSGBOXIMPL_H
 #define TIMEOUTMSGBOXIMPL_H
 
 #include <QMessageBox>
diff --git a/src/gui/qttoolsinterface.cpp b/src/gui/qttoolsinterface.cpp
index abd310e7..4f7e2d61 100644
--- a/src/gui/qttoolsinterface.cpp
+++ b/src/gui/qttoolsinterface.cpp
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #include "qttoolsinterface.h"
+ *****************************************************************************/
+#include "qttoolsinterface.h"
 
 QtToolsInterface::~QtToolsInterface()
 {
diff --git a/src/gui/qttoolsinterface.h b/src/gui/qttoolsinterface.h
index d7accd5f..aa30bce0 100644
--- a/src/gui/qttoolsinterface.h
+++ b/src/gui/qttoolsinterface.h
@@ -14,7 +14,8 @@
  *                                                                           *
  * You should have received a copy of the GNU Affero General Public License  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
- *****************************************************************************/ #ifndef QTTOOLSINTERFACE_H
+ *****************************************************************************/
+#ifndef QTTOOLSINTERFACE_H
 #define QTTOOLSINTERFACE_H
 
 #include <string>