15 files changed, 3 insertions, 61 deletions
diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp
index e4285cffd..5187c625b 100644
--- a/src/gui/base/widgets/button.cpp
+++ b/src/gui/base/widgets/button.cpp
@@ -67,11 +67,6 @@
 
 #include "gui/base/widgets/button.hpp"
 
-#include "gui/font.h"
-
-#include "input/key.h"
-#include "input/mouseinput.h"
-
 #include "events/mouseevent.h"
 
 #include "render/graphics.h"
diff --git a/src/gui/base/widgets/button.hpp b/src/gui/base/widgets/button.hpp
index 7fd5613bd..fea175362 100644
--- a/src/gui/base/widgets/button.hpp
+++ b/src/gui/base/widgets/button.hpp
@@ -70,8 +70,6 @@
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
 
-#include "events/mouseevent.h"
-
 #include "gui/base/widget.hpp"
 
 #include "render/graphics.h"
diff --git a/src/gui/base/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp
index d75fb5cb0..a5ec72dfa 100644
--- a/src/gui/base/widgets/checkbox.cpp
+++ b/src/gui/base/widgets/checkbox.cpp
@@ -67,13 +67,6 @@
 
 #include "gui/base/widgets/checkbox.hpp"
 
-#include "gui/font.h"
-
-#include "input/key.h"
-#include "input/mouseinput.h"
-
-#include "render/graphics.h"
-
 #include "debug.h"
 
 namespace gcn
diff --git a/src/gui/base/widgets/checkbox.hpp b/src/gui/base/widgets/checkbox.hpp
index d87a6b206..c79ccaff9 100644
--- a/src/gui/base/widgets/checkbox.hpp
+++ b/src/gui/base/widgets/checkbox.hpp
@@ -90,7 +90,7 @@ namespace gcn
         /**
          * Contructor.
          */
-        CheckBox(const Widget2 *const widget);
+        explicit CheckBox(const Widget2 *const widget);
 
         /**
          * Constructor. The check box will be automatically resized
diff --git a/src/gui/base/widgets/container.hpp b/src/gui/base/widgets/container.hpp
index ba3cff153..3e6c0a587 100644
--- a/src/gui/base/widgets/container.hpp
+++ b/src/gui/base/widgets/container.hpp
@@ -64,12 +64,8 @@
 #ifndef GCN_CONTAINER_HPP
 #define GCN_CONTAINER_HPP
 
-#include <list>
-
 #include "gui/base/basiccontainer.hpp"
 
-#include "render/graphics.h"
-
 namespace gcn
 {
     /**
@@ -89,7 +85,7 @@ namespace gcn
          *
          * @see setOpaque, isOpaque
          */
-        Container(const Widget2 *const widget);
+        explicit Container(const Widget2 *const widget);
 
         /**
          * Destructor.
diff --git a/src/gui/base/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp
index 0dd5c88f7..02d94626c 100644
--- a/src/gui/base/widgets/listbox.cpp
+++ b/src/gui/base/widgets/listbox.cpp
@@ -69,16 +69,8 @@
 
 #include "gui/font.h"
 
-#include "gui/base/basiccontainer.hpp"
-#include "gui/base/listmodel.hpp"
-
-#include "input/key.h"
-#include "input/mouseinput.h"
-
 #include "listeners/selectionlistener.h"
 
-#include "render/graphics.h"
-
 #include "debug.h"
 
 namespace gcn
diff --git a/src/gui/base/widgets/radiobutton.cpp b/src/gui/base/widgets/radiobutton.cpp
index 832c00bbe..e17b9f776 100644
--- a/src/gui/base/widgets/radiobutton.cpp
+++ b/src/gui/base/widgets/radiobutton.cpp
@@ -67,13 +67,6 @@
 
 #include "gui/base/widgets/radiobutton.hpp"
 
-#include "gui/font.h"
-
-#include "input/key.h"
-#include "input/mouseinput.h"
-
-#include "render/graphics.h"
-
 #include "debug.h"
 
 namespace gcn
diff --git a/src/gui/base/widgets/radiobutton.hpp b/src/gui/base/widgets/radiobutton.hpp
index 4d4403fac..f4bfd53fa 100644
--- a/src/gui/base/widgets/radiobutton.hpp
+++ b/src/gui/base/widgets/radiobutton.hpp
@@ -93,7 +93,7 @@ namespace gcn
         /**
          * Constructor.
          */
-        RadioButton(const Widget2 *const widget);
+        explicit RadioButton(const Widget2 *const widget);
 
         /**
          * Constructor. The radio button will be automatically resized
diff --git a/src/gui/base/widgets/scrollarea.cpp b/src/gui/base/widgets/scrollarea.cpp
index 68e1b72d3..0fc605fa3 100644
--- a/src/gui/base/widgets/scrollarea.cpp
+++ b/src/gui/base/widgets/scrollarea.cpp
@@ -67,9 +67,6 @@
 
 #include "gui/base/widgets/scrollarea.hpp"
 
-
-#include "render/graphics.h"
-
 #include "debug.h"
 
 namespace gcn
diff --git a/src/gui/base/widgets/scrollarea.hpp b/src/gui/base/widgets/scrollarea.hpp
index e2d8aada5..669ccfbdd 100644
--- a/src/gui/base/widgets/scrollarea.hpp
+++ b/src/gui/base/widgets/scrollarea.hpp
@@ -64,8 +64,6 @@
 #ifndef GCN_SCROLLAREA_HPP
 #define GCN_SCROLLAREA_HPP
 
-#include <string>
-
 #include "gui/base/basiccontainer.hpp"
 #include "listeners/mouselistener.h"
 
diff --git a/src/gui/base/widgets/slider.cpp b/src/gui/base/widgets/slider.cpp
index e995ff55a..4e9df0341 100644
--- a/src/gui/base/widgets/slider.cpp
+++ b/src/gui/base/widgets/slider.cpp
@@ -67,11 +67,6 @@
 
 #include "gui/base/widgets/slider.hpp"
 
-#include "input/key.h"
-#include "input/mouseinput.h"
-
-#include "render/graphics.h"
-
 #include "debug.h"
 
 namespace gcn
diff --git a/src/gui/base/widgets/textbox.cpp b/src/gui/base/widgets/textbox.cpp
index 7a5b63a50..bb22a6f46 100644
--- a/src/gui/base/widgets/textbox.cpp
+++ b/src/gui/base/widgets/textbox.cpp
@@ -69,11 +69,6 @@
 
 #include "gui/font.h"
 
-#include "gui/base/basiccontainer.hpp"
-
-#include "input/key.h"
-#include "input/mouseinput.h"
-
 #include "render/graphics.h"
 
 #include "debug.h"
diff --git a/src/gui/base/widgets/textbox.hpp b/src/gui/base/widgets/textbox.hpp
index 0c96096ec..151af8c00 100644
--- a/src/gui/base/widgets/textbox.hpp
+++ b/src/gui/base/widgets/textbox.hpp
@@ -64,7 +64,6 @@
 #ifndef GCN_TEXTBOX_HPP
 #define GCN_TEXTBOX_HPP
 
-#include <ctime>
 #include <string>
 #include <vector>
 
diff --git a/src/gui/base/widgets/textfield.cpp b/src/gui/base/widgets/textfield.cpp
index 6ca37c4af..ddcbec1b4 100644
--- a/src/gui/base/widgets/textfield.cpp
+++ b/src/gui/base/widgets/textfield.cpp
@@ -69,11 +69,6 @@
 
 #include "gui/font.h"
 
-#include "input/key.h"
-#include "input/mouseinput.h"
-
-#include "render/graphics.h"
-
 #include "debug.h"
 
 namespace gcn
diff --git a/src/gui/base/widgets/window.cpp b/src/gui/base/widgets/window.cpp
index 0ead95bc1..401e3ab6d 100644
--- a/src/gui/base/widgets/window.cpp
+++ b/src/gui/base/widgets/window.cpp
@@ -67,10 +67,6 @@
 
 #include "gui/base/widgets/window.hpp"
 
-#include "gui/font.h"
-
-#include "input/mouseinput.h"
-
 #include "render/graphics.h"
 
 #include "debug.h"