diff --git a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp
index 1d6b6e3f..00bd2310 100644
--- a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp
+++ b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp
@@ -18,6 +18,8 @@
 #include "changecontentdialogimpl.h"
 // #include "session.h"
 #include "configfile.h"
+#include <QtGui>
+#include <QtCore>
 
 changeContentDialogImpl::changeContentDialogImpl(QWidget *parent, ConfigFile *config, DialogType t)
 	: QDialog(parent), myConfig(config), myType(t)
diff --git a/src/gui/qt/changecontentdialog/changecontentdialogimpl.h b/src/gui/qt/changecontentdialog/changecontentdialogimpl.h
index f36a789b..fc9e1a75 100644
--- a/src/gui/qt/changecontentdialog/changecontentdialogimpl.h
+++ b/src/gui/qt/changecontentdialog/changecontentdialogimpl.h
@@ -24,8 +24,6 @@
 #include "ui_changecontentdialog.h"
 #endif
 
-#include <QtCore>
-
 enum DialogType { CHANGE_HUMAN_PLAYER_NAME=0, CHANGE_NICK_ALREADY_IN_USE, CHANGE_NICK_INVALID, CHANGE_INET_BAD_GAME_NAME, CHANGE_INET_GAME_NAME_IN_USE };
 
 class ConfigFile;
diff --git a/src/gui/qt/gui_800x480/tabs_800x480.ui b/src/gui/qt/gui_800x480/tabs_800x480.ui
index 7e815051..c35a84d7 100644
--- a/src/gui/qt/gui_800x480/tabs_800x480.ui
+++ b/src/gui/qt/gui_800x480/tabs_800x480.ui
@@ -29,18 +29,9 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <property name="leftMargin">
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="topMargin">
-    <number>10</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>20</number>
-   </property>
    <property name="spacing">
     <number>0</number>
    </property>