fix includes

20 files changed, 56 insertions, 11 deletions

diff --git a/src/base/ringbuffer.cpp b/src/base/ringbuffer.cpp
index 1f745342..72b09666 100644
--- a/src/base/ringbuffer.cpp
+++ b/src/base/ringbuffer.cpp
@@ -22,9 +22,11 @@
  *
  */
 
+#include <cstdlib>
+#include <cstring>
+#include <cstddef>
+
 #include "ringbuffer.hpp"
-#include <stdlib.h>
-#include <string.h>
 
 namespace usdx
 {
diff --git a/src/base/songloading/songloader.cpp b/src/base/songloading/songloader.cpp
index b7364813..a27ba652 100644
--- a/src/base/songloading/songloader.cpp
+++ b/src/base/songloading/songloader.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cstddef>
+
 #include "songloader.hpp"
 #include "songloading_strategy_txt.hpp"
 #include "songloading_strategy_xml.hpp"
diff --git a/src/base/songloading/songloading_strategy_factory.hpp b/src/base/songloading/songloading_strategy_factory.hpp
index 6d7026cd..3d038ead 100644
--- a/src/base/songloading/songloading_strategy_factory.hpp
+++ b/src/base/songloading/songloading_strategy_factory.hpp
@@ -25,6 +25,8 @@
 #ifndef SONGLOADING_STRATEGY_FACTORY_HPP
 #define SONGLOADING_STRATEGY_FACTORY_HPP
 
+#include <cstddef>
+
 #include "songloading_strategy_base_factory.hpp"
 
 namespace usdx
diff --git a/src/base/songloading/songloading_strategy_xml.cpp b/src/base/songloading/songloading_strategy_xml.cpp
index 1925571d..64715960 100644
--- a/src/base/songloading/songloading_strategy_xml.cpp
+++ b/src/base/songloading/songloading_strategy_xml.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cstddef>
+
 #include "songloading_strategy_xml.hpp"
 
 namespace usdx
diff --git a/src/menu/application.cpp b/src/menu/application.cpp
index e18abf24..f4802220 100644
--- a/src/menu/application.cpp
+++ b/src/menu/application.cpp
@@ -22,14 +22,19 @@
  *
  */
 
+#include <cstddef>
+#include <exception>
+
+#include <GL/gl.h>
+
+#include <log4cpp/PropertyConfigurator.hh>
+
 #include "application.hpp"
 #include "event_manager.hpp"
 #include "mouse_manager.hpp"
-#include <exception>
 #include "software_mouse_pointer.hpp"
+
 #include "frames/loading_frame.hpp"
-#include <GL/gl.h>
-#include <log4cpp/PropertyConfigurator.hh>
 
 namespace usdx
 {
diff --git a/src/menu/background_image.cpp b/src/menu/background_image.cpp
index 451587f7..e80d82cf 100644
--- a/src/menu/background_image.cpp
+++ b/src/menu/background_image.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cstddef>
+
 #include "background_image.hpp"
 #include "drawable_control.hpp"
 #include "utils/activator.hpp"
diff --git a/src/menu/container.cpp b/src/menu/container.cpp
index fb13d398..6b7e9180 100644
--- a/src/menu/container.cpp
+++ b/src/menu/container.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cstddef>
+
 #include "container.hpp"
 #include "frame.hpp"
 #include "modelview_matrix_cache.hpp"
diff --git a/src/menu/control.cpp b/src/menu/control.cpp
index 450df813..ca7ad610 100644
--- a/src/menu/control.cpp
+++ b/src/menu/control.cpp
@@ -23,6 +23,7 @@
  */
 
 #include <cstddef>
+
 #include "control.hpp"
 
 namespace usdx
diff --git a/src/menu/drawable_control.cpp b/src/menu/drawable_control.cpp
index 72c3ec77..1793981c 100644
--- a/src/menu/drawable_control.cpp
+++ b/src/menu/drawable_control.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cstddef>
+
 #include <GL/gl.h>
 
 #include "drawable_control.hpp"
diff --git a/src/menu/frame.cpp b/src/menu/frame.cpp
index f751cd42..ef12fef1 100644
--- a/src/menu/frame.cpp
+++ b/src/menu/frame.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cstddef>
+
 #include "frame.hpp"
 
 namespace usdx
diff --git a/src/menu/mouse_event.cpp b/src/menu/mouse_event.cpp
index e140c6e4..71508667 100644
--- a/src/menu/mouse_event.cpp
+++ b/src/menu/mouse_event.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cstddef>
+
 #include "mouse_event.hpp"
 #include "base/time.hpp"
 
diff --git a/src/menu/mouse_manager.cpp b/src/menu/mouse_manager.cpp
index 0910da6f..3b4eb268 100644
--- a/src/menu/mouse_manager.cpp
+++ b/src/menu/mouse_manager.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cstddef>
+
 #include "mouse_manager.hpp"
 #include "utils/rectangle.hpp"
 #include "container.hpp"
diff --git a/src/menu/software_mouse_pointer.cpp b/src/menu/software_mouse_pointer.cpp
index 9c9bfc38..349dc6e1 100644
--- a/src/menu/software_mouse_pointer.cpp
+++ b/src/menu/software_mouse_pointer.cpp
@@ -21,10 +21,12 @@
  * Boston, MA 02110-1301, USA.
  *
  */
+#include <cstddef>
+#include <iostream>
 
-#include "software_mouse_pointer.hpp"
 #include <GL/gl.h>
-#include <iostream>
+
+#include "software_mouse_pointer.hpp"
 #include "utils/activator.hpp"
 
 namespace usdx
diff --git a/src/menu/static.cpp b/src/menu/static.cpp
index 786645b4..16e378e8 100644
--- a/src/menu/static.cpp
+++ b/src/menu/static.cpp
@@ -22,7 +22,10 @@
  *
  */
 
+#include <cstddef>
+
 #include <GL/gl.h>
+
 #include "static.hpp"
 
 namespace usdx
diff --git a/src/menu/text.cpp b/src/menu/text.cpp
index 0e2b07c9..e0d4a8fc 100644
--- a/src/menu/text.cpp
+++ b/src/menu/text.cpp
@@ -22,10 +22,12 @@
  *
  */
 
-#include "text.hpp"
+#include <cstddef>
 #include <exception>
+
 #include <GL/gl.h>
 
+#include "text.hpp"
 
 namespace usdx
 {
diff --git a/src/utils/binary_file.cpp b/src/utils/binary_file.cpp
index 06056405..536bdc70 100644
--- a/src/utils/binary_file.cpp
+++ b/src/utils/binary_file.cpp
@@ -22,9 +22,11 @@
  *
  */
 
-#include "binary_file.hpp"
+#include <cstddef>
 #include <string>
 
+#include "binary_file.hpp"
+
 namespace usdx
 {
 	BinaryFile::BinaryFile(const std::string& filename) : file(filename.c_str(), std::ifstream::in | std::ifstream::binary), content(NULL)
diff --git a/src/utils/image.cpp b/src/utils/image.cpp
index 3fd8b3a9..10d4c13b 100644
--- a/src/utils/image.cpp
+++ b/src/utils/image.cpp
@@ -22,8 +22,11 @@
  *
  */
 
-#include "image.hpp"
+#include <cstddef>
+
 #include <SDL/SDL_image.h>
+
+#include "image.hpp"
 #include "utils/binary_file.hpp"
 
 namespace usdx
diff --git a/src/utils/rgb_color.cpp b/src/utils/rgb_color.cpp
index 2e8954c0..0ebfe67c 100644
--- a/src/utils/rgb_color.cpp
+++ b/src/utils/rgb_color.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cstddef>
+
 #include "rgb_color.hpp"
 
 namespace usdx
diff --git a/src/utils/rgba_color.cpp b/src/utils/rgba_color.cpp
index bacb37de..aed484f6 100644
--- a/src/utils/rgba_color.cpp
+++ b/src/utils/rgba_color.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cstddef>
+
 #include "rgba_color.hpp"
 
 namespace usdx
diff --git a/test/base/ringbuffer.cpp b/test/base/ringbuffer.cpp
index eb672498..16060570 100644
--- a/test/base/ringbuffer.cpp
+++ b/test/base/ringbuffer.cpp
@@ -24,10 +24,13 @@
  * $Id$
  */
 
-#include "ringbuffer.hpp"
+#include <cstddef>
 #include <cstring>
+
 #include <cppunit/extensions/HelperMacros.h>
 
+#include "ringbuffer.hpp"
+
 namespace usdx
 {
 	class RingBufferTest : public CppUnit::TestFixture {