[Pingus-CVS] r4050 - in trunk/pingus/src: engine/display engine/display/opengl engine/gui engine/input engine/input/evdev engine/input/usbmouse engine/input/wiimote engine/input/xinput engine/input_old engine/input_old/axes engine/input_old/buttons engine/input_old/pointers engine/input_old/scrollers engine/screen engine/sound math pingus pingus/actions pingus/colliders pingus/components pingus/movers pingus/particles pingus/screens pingus/worldmap pingus/worldobjs util

[grumbel at BerliOS]

Author: grumbel
Date: 2009-11-06 01:28:22 +0100 (Fri, 06 Nov 2009)
New Revision: 4050

Modified:
   trunk/pingus/src/engine/display/blitter.hpp
   trunk/pingus/src/engine/display/blitter_impl.hpp
   trunk/pingus/src/engine/display/delta_framebuffer.hpp
   trunk/pingus/src/engine/display/display.hpp
   trunk/pingus/src/engine/display/drawing_context.hpp
   trunk/pingus/src/engine/display/drawing_request.hpp
   trunk/pingus/src/engine/display/font.hpp
   trunk/pingus/src/engine/display/font_description.hpp
   trunk/pingus/src/engine/display/framebuffer.hpp
   trunk/pingus/src/engine/display/framebuffer_surface.hpp
   trunk/pingus/src/engine/display/null_framebuffer.hpp
   trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp
   trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
   trunk/pingus/src/engine/display/rect_merger.hpp
   trunk/pingus/src/engine/display/scene_context.hpp
   trunk/pingus/src/engine/display/scene_group.hpp
   trunk/pingus/src/engine/display/screenshot.hpp
   trunk/pingus/src/engine/display/sdl_framebuffer.hpp
   trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
   trunk/pingus/src/engine/display/sprite.hpp
   trunk/pingus/src/engine/display/sprite_description.hpp
   trunk/pingus/src/engine/display/sprite_impl.hpp
   trunk/pingus/src/engine/display/surface.hpp
   trunk/pingus/src/engine/gui/button.hpp
   trunk/pingus/src/engine/gui/combobox_listener.hpp
   trunk/pingus/src/engine/gui/component.hpp
   trunk/pingus/src/engine/gui/game_delta_recorder.hpp
   trunk/pingus/src/engine/gui/group_component.hpp
   trunk/pingus/src/engine/gui/gui_manager.hpp
   trunk/pingus/src/engine/gui/rect_component.hpp
   trunk/pingus/src/engine/gui/surface_button.hpp
   trunk/pingus/src/engine/input/control.hpp
   trunk/pingus/src/engine/input/controller.hpp
   trunk/pingus/src/engine/input/controller_description.hpp
   trunk/pingus/src/engine/input/core_driver.hpp
   trunk/pingus/src/engine/input/driver.hpp
   trunk/pingus/src/engine/input/evdev/evdev_device.hpp
   trunk/pingus/src/engine/input/evdev/evdev_driver.hpp
   trunk/pingus/src/engine/input/event.hpp
   trunk/pingus/src/engine/input/manager.hpp
   trunk/pingus/src/engine/input/sdl_driver.hpp
   trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp
   trunk/pingus/src/engine/input/wiimote/wiimote.hpp
   trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp
   trunk/pingus/src/engine/input/xinput/xinput_device.hpp
   trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
   trunk/pingus/src/engine/input_old/axes/button_axis.hpp
   trunk/pingus/src/engine/input_old/axes/dummy_axis.hpp
   trunk/pingus/src/engine/input_old/axes/inverted_axis.hpp
   trunk/pingus/src/engine/input_old/axes/joystick_axis.hpp
   trunk/pingus/src/engine/input_old/axes/mouse_axis.hpp
   trunk/pingus/src/engine/input_old/axes/multiple_axis.hpp
   trunk/pingus/src/engine/input_old/axis.hpp
   trunk/pingus/src/engine/input_old/axis_factory.hpp
   trunk/pingus/src/engine/input_old/button.hpp
   trunk/pingus/src/engine/input_old/button_factory.hpp
   trunk/pingus/src/engine/input_old/buttons/double_button.hpp
   trunk/pingus/src/engine/input_old/buttons/dummy_button.hpp
   trunk/pingus/src/engine/input_old/buttons/joystick_button.hpp
   trunk/pingus/src/engine/input_old/buttons/key_button.hpp
   trunk/pingus/src/engine/input_old/buttons/mouse_button.hpp
   trunk/pingus/src/engine/input_old/buttons/multiple_button.hpp
   trunk/pingus/src/engine/input_old/buttons/triple_button.hpp
   trunk/pingus/src/engine/input_old/controller.hpp
   trunk/pingus/src/engine/input_old/event.hpp
   trunk/pingus/src/engine/input_old/event_fwd.hpp
   trunk/pingus/src/engine/input_old/pointer.hpp
   trunk/pingus/src/engine/input_old/pointer_factory.hpp
   trunk/pingus/src/engine/input_old/pointers/axis_pointer.hpp
   trunk/pingus/src/engine/input_old/pointers/dummy_pointer.hpp
   trunk/pingus/src/engine/input_old/pointers/mouse_pointer.hpp
   trunk/pingus/src/engine/input_old/pointers/multiple_pointer.hpp
   trunk/pingus/src/engine/input_old/scroller.hpp
   trunk/pingus/src/engine/input_old/scroller_factory.hpp
   trunk/pingus/src/engine/input_old/scrollers/axis_scroller.hpp
   trunk/pingus/src/engine/input_old/scrollers/dummy_scroller.hpp
   trunk/pingus/src/engine/input_old/scrollers/inverted_scroller.hpp
   trunk/pingus/src/engine/input_old/scrollers/joystick_scroller.hpp
   trunk/pingus/src/engine/input_old/scrollers/mouse_scroller.hpp
   trunk/pingus/src/engine/input_old/scrollers/multiple_scroller.hpp
   trunk/pingus/src/engine/input_old/scrollers/pointer_scroller.hpp
   trunk/pingus/src/engine/screen/gui_screen.hpp
   trunk/pingus/src/engine/screen/screen.hpp
   trunk/pingus/src/engine/screen/screen_manager.hpp
   trunk/pingus/src/engine/screen/screen_manager_impl.hpp
   trunk/pingus/src/engine/sound/sound.hpp
   trunk/pingus/src/engine/sound/sound_dummy.hpp
   trunk/pingus/src/engine/sound/sound_impl.hpp
   trunk/pingus/src/engine/sound/sound_real.hpp
   trunk/pingus/src/engine/sound/sound_res_mgr.hpp
   trunk/pingus/src/math/size.hpp
   trunk/pingus/src/pingus/actions/angel.hpp
   trunk/pingus/src/pingus/actions/basher.hpp
   trunk/pingus/src/pingus/actions/blocker.hpp
   trunk/pingus/src/pingus/actions/boarder.hpp
   trunk/pingus/src/pingus/actions/bomber.hpp
   trunk/pingus/src/pingus/actions/bridger.hpp
   trunk/pingus/src/pingus/actions/climber.hpp
   trunk/pingus/src/pingus/actions/digger.hpp
   trunk/pingus/src/pingus/actions/drown.hpp
   trunk/pingus/src/pingus/actions/exiter.hpp
   trunk/pingus/src/pingus/actions/faller.hpp
   trunk/pingus/src/pingus/actions/floater.hpp
   trunk/pingus/src/pingus/actions/jumper.hpp
   trunk/pingus/src/pingus/actions/laser_kill.hpp
   trunk/pingus/src/pingus/actions/miner.hpp
   trunk/pingus/src/pingus/actions/rocket_launcher.hpp
   trunk/pingus/src/pingus/actions/slider.hpp
   trunk/pingus/src/pingus/actions/smashed.hpp
   trunk/pingus/src/pingus/actions/splashed.hpp
   trunk/pingus/src/pingus/actions/superman.hpp
   trunk/pingus/src/pingus/actions/waiter.hpp
   trunk/pingus/src/pingus/actions/walker.hpp
   trunk/pingus/src/pingus/colliders/pingu_collider.hpp
   trunk/pingus/src/pingus/components/action_button.hpp
   trunk/pingus/src/pingus/components/button_panel.hpp
   trunk/pingus/src/pingus/components/check_box.hpp
   trunk/pingus/src/pingus/components/choice_box.hpp
   trunk/pingus/src/pingus/components/label.hpp
   trunk/pingus/src/pingus/components/menu_button.hpp
   trunk/pingus/src/pingus/components/pingus_counter.hpp
   trunk/pingus/src/pingus/components/playfield.hpp
   trunk/pingus/src/pingus/components/slider_box.hpp
   trunk/pingus/src/pingus/components/smallmap.hpp
   trunk/pingus/src/pingus/components/time_display.hpp
   trunk/pingus/src/pingus/movers/linear_mover.hpp
   trunk/pingus/src/pingus/particles/explosive_particle.hpp
   trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp
   trunk/pingus/src/pingus/particles/rain_particle_holder.hpp
   trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp
   trunk/pingus/src/pingus/particles/snow_particle_holder.hpp
   trunk/pingus/src/pingus/screens/addon_menu.hpp
   trunk/pingus/src/pingus/screens/credits.hpp
   trunk/pingus/src/pingus/screens/demo_session.hpp
   trunk/pingus/src/pingus/screens/font_test_screen.hpp
   trunk/pingus/src/pingus/screens/game_session.hpp
   trunk/pingus/src/pingus/screens/level_menu.hpp
   trunk/pingus/src/pingus/screens/option_menu.hpp
   trunk/pingus/src/pingus/screens/pingus_menu.hpp
   trunk/pingus/src/pingus/screens/result_screen.hpp
   trunk/pingus/src/pingus/screens/start_screen.hpp
   trunk/pingus/src/pingus/screens/story_screen.hpp
   trunk/pingus/src/pingus/smallmap_image.hpp
   trunk/pingus/src/pingus/worldmap/dot.hpp
   trunk/pingus/src/pingus/worldmap/dot_factory.hpp
   trunk/pingus/src/pingus/worldmap/drawable.hpp
   trunk/pingus/src/pingus/worldmap/drawable_factory.hpp
   trunk/pingus/src/pingus/worldmap/graph.hpp
   trunk/pingus/src/pingus/worldmap/level_dot.hpp
   trunk/pingus/src/pingus/worldmap/path.hpp
   trunk/pingus/src/pingus/worldmap/path_drawable.hpp
   trunk/pingus/src/pingus/worldmap/path_graph.hpp
   trunk/pingus/src/pingus/worldmap/pathfinder.hpp
   trunk/pingus/src/pingus/worldmap/pingus.hpp
   trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
   trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp
   trunk/pingus/src/pingus/worldmap/worldmap.hpp
   trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
   trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp
   trunk/pingus/src/pingus/worldmap/worldmap_story.hpp
   trunk/pingus/src/pingus/worldobjs/conveyor_belt.hpp
   trunk/pingus/src/pingus/worldobjs/entrance.hpp
   trunk/pingus/src/pingus/worldobjs/exit.hpp
   trunk/pingus/src/pingus/worldobjs/fake_exit.hpp
   trunk/pingus/src/pingus/worldobjs/groundpiece.hpp
   trunk/pingus/src/pingus/worldobjs/guillotine.hpp
   trunk/pingus/src/pingus/worldobjs/hammer.hpp
   trunk/pingus/src/pingus/worldobjs/hotspot.hpp
   trunk/pingus/src/pingus/worldobjs/ice_block.hpp
   trunk/pingus/src/pingus/worldobjs/laser_exit.hpp
   trunk/pingus/src/pingus/worldobjs/liquid.hpp
   trunk/pingus/src/pingus/worldobjs/rain_generator.hpp
   trunk/pingus/src/pingus/worldobjs/smasher.hpp
   trunk/pingus/src/pingus/worldobjs/snow_generator.hpp
   trunk/pingus/src/pingus/worldobjs/solid_color_background.hpp
   trunk/pingus/src/pingus/worldobjs/spike.hpp
   trunk/pingus/src/pingus/worldobjs/starfield_background.hpp
   trunk/pingus/src/pingus/worldobjs/starfield_background_stars.hpp
   trunk/pingus/src/pingus/worldobjs/surface_background.hpp
   trunk/pingus/src/pingus/worldobjs/switch_door.hpp
   trunk/pingus/src/pingus/worldobjs/teleporter.hpp
   trunk/pingus/src/pingus/worldobjs/teleporter_target.hpp
   trunk/pingus/src/pingus/worldobjs/thunderstorm_background.hpp
   trunk/pingus/src/pingus/worldobjs/woodthing.hpp
   trunk/pingus/src/util/line_iterator.hpp
Log:
Include guard updates

Modified: trunk/pingus/src/engine/display/blitter.hpp
===================================================================
--- trunk/pingus/src/engine/display/blitter.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/display/blitter.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_BLITTER_HPP
-#define HEADER_PINGUS_PINGUS_BLITTER_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_BLITTER_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_BLITTER_HPP
 
 #include "SDL.h"
 #include "pingus/pingus.hpp"

Modified: trunk/pingus/src/engine/display/blitter_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/blitter_impl.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/display/blitter_impl.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_BLITTER_IMPL_HPP
-#define HEADER_PINGUS_PINGUS_BLITTER_IMPL_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_BLITTER_IMPL_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_BLITTER_IMPL_HPP
 
 #include <iostream>
 #include "engine/display/surface.hpp"

Modified: trunk/pingus/src/engine/display/delta_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/delta_framebuffer.hpp       2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/display/delta_framebuffer.hpp       2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_DELTA_FRAMEBUFFER_HPP
-#define HEADER_PINGUS_DISPLAY_DELTA_FRAMEBUFFER_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DELTA_FRAMEBUFFER_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_DELTA_FRAMEBUFFER_HPP
 
 #include <memory>
 #include <map>

Modified: trunk/pingus/src/engine/display/display.hpp
===================================================================
--- trunk/pingus/src/engine/display/display.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/display/display.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_DISPLAY_HPP
-#define HEADER_PINGUS_DISPLAY_DISPLAY_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DISPLAY_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_DISPLAY_HPP
 
 #include <memory>
 #include <list>

Modified: trunk/pingus/src/engine/display/drawing_context.hpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_DRAWING_CONTEXT_HPP
-#define HEADER_PINGUS_DISPLAY_DRAWING_CONTEXT_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DRAWING_CONTEXT_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_DRAWING_CONTEXT_HPP
 
 #include "SDL.h"
 #include <vector>

Modified: trunk/pingus/src/engine/display/drawing_request.hpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_request.hpp 2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/display/drawing_request.hpp 2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_DRAWING_REQUEST_HPP
-#define HEADER_PINGUS_DISPLAY_DRAWING_REQUEST_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DRAWING_REQUEST_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_DRAWING_REQUEST_HPP
 
 #include "SDL.h"
 #include "math/vector2i.hpp"

Modified: trunk/pingus/src/engine/display/font.hpp
===================================================================
--- trunk/pingus/src/engine/display/font.hpp    2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/display/font.hpp    2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_FONT_HPP
-#define HEADER_PINGUS_PINGUS_FONT_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FONT_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_FONT_HPP
 
 #include <string>
 #include <boost/shared_ptr.hpp>

Modified: trunk/pingus/src/engine/display/font_description.hpp
===================================================================
--- trunk/pingus/src/engine/display/font_description.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/display/font_description.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_FONT_DESCRIPTION_HPP
-#define HEADER_PINGUS_PINGUS_FONT_DESCRIPTION_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FONT_DESCRIPTION_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_FONT_DESCRIPTION_HPP
 
 #include <string>
 #include <vector>

Modified: trunk/pingus/src/engine/display/framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/framebuffer.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/display/framebuffer.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_FRAMEBUFFER_HPP
-#define HEADER_PINGUS_DISPLAY_FRAMEBUFFER_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FRAMEBUFFER_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_FRAMEBUFFER_HPP
 
 #include <vector>
 #include "SDL.h"

Modified: trunk/pingus/src/engine/display/framebuffer_surface.hpp
===================================================================
--- trunk/pingus/src/engine/display/framebuffer_surface.hpp     2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/display/framebuffer_surface.hpp     2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_FRAMEBUFFER_SURFACE_HPP
-#define HEADER_PINGUS_DISPLAY_FRAMEBUFFER_SURFACE_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FRAMEBUFFER_SURFACE_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_FRAMEBUFFER_SURFACE_HPP
 
 #include <boost/smart_ptr.hpp>
 

Modified: trunk/pingus/src/engine/display/null_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/null_framebuffer.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/display/null_framebuffer.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_NULL_FRAMEBUFFER_HPP
-#define HEADER_PINGUS_DISPLAY_NULL_FRAMEBUFFER_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_NULL_FRAMEBUFFER_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_NULL_FRAMEBUFFER_HPP
 
 #include "engine/display/framebuffer.hpp"
 

Modified: trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp       
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp       
2009-11-06 00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_OPENGL_FRAMEBUFFER_HPP
-#define HEADER_PINGUS_DISPLAY_OPENGL_FRAMEBUFFER_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_OPENGL_OPENGL_FRAMEBUFFER_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_OPENGL_OPENGL_FRAMEBUFFER_HPP
 
 #include "engine/display/framebuffer.hpp"
 

Modified: 
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp  
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp  
2009-11-06 00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_OPENGL_FRAMEBUFFER_SURFACE_IMPL_HPP
-#define HEADER_PINGUS_DISPLAY_OPENGL_FRAMEBUFFER_SURFACE_IMPL_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_OPENGL_OPENGL_FRAMEBUFFER_SURFACE_IMPL_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_OPENGL_OPENGL_FRAMEBUFFER_SURFACE_IMPL_HPP
 
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN

Modified: trunk/pingus/src/engine/display/rect_merger.hpp
===================================================================
--- trunk/pingus/src/engine/display/rect_merger.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/display/rect_merger.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_RECT_MERGER_HPP
-#define HEADER_PINGUS_DISPLAY_RECT_MERGER_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_RECT_MERGER_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_RECT_MERGER_HPP
 
 #include <vector>
 #include "math/rect.hpp"

Modified: trunk/pingus/src/engine/display/scene_context.hpp
===================================================================
--- trunk/pingus/src/engine/display/scene_context.hpp   2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/display/scene_context.hpp   2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_SCENE_CONTEXT_HPP
-#define HEADER_PINGUS_DISPLAY_SCENE_CONTEXT_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SCENE_CONTEXT_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_SCENE_CONTEXT_HPP
 
 #include "SDL.h"
 #include "engine/display/drawing_context.hpp"

Modified: trunk/pingus/src/engine/display/scene_group.hpp
===================================================================
--- trunk/pingus/src/engine/display/scene_group.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/display/scene_group.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_SCENE_GROUP_HPP
-#define HEADER_PINGUS_DISPLAY_SCENE_GROUP_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SCENE_GROUP_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_SCENE_GROUP_HPP
 
 /** */
 class Scene_Group

Modified: trunk/pingus/src/engine/display/screenshot.hpp
===================================================================
--- trunk/pingus/src/engine/display/screenshot.hpp      2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/display/screenshot.hpp      2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_SCREENSHOT_HPP
-#define HEADER_PINGUS_PINGUS_SCREENSHOT_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SCREENSHOT_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_SCREENSHOT_HPP
 
 #include "SDL.h"
 

Modified: trunk/pingus/src/engine/display/sdl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_SDL_FRAMEBUFFER_HPP
-#define HEADER_PINGUS_DISPLAY_SDL_FRAMEBUFFER_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_HPP
 
 #include <vector>
 #include "SDL.h"

Modified: trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp    
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp    
2009-11-06 00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
-#define HEADER_PINGUS_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
 
 #include "SDL.h"
 #include "engine/display/framebuffer_surface.hpp"

Modified: trunk/pingus/src/engine/display/sprite.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/display/sprite.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_SPRITE_HPP
-#define HEADER_PINGUS_PINGUS_SPRITE_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_HPP
 
 #include <string>
 #include <boost/shared_ptr.hpp>

Modified: trunk/pingus/src/engine/display/sprite_description.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_description.hpp      2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/display/sprite_description.hpp      2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_SPRITE_DESCRIPTION_HPP
-#define HEADER_PINGUS_PINGUS_SPRITE_DESCRIPTION_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_DESCRIPTION_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_DESCRIPTION_HPP
 
 #include <iostream>
 #include "math/vector2i.hpp"

Modified: trunk/pingus/src/engine/display/sprite_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_impl.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/display/sprite_impl.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_SPRITE_IMPL_HPP
-#define HEADER_PINGUS_PINGUS_SPRITE_IMPL_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_IMPL_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_IMPL_HPP
 
 #include "engine/display/surface.hpp"
 #include "engine/display/framebuffer_surface.hpp"

Modified: trunk/pingus/src/engine/display/surface.hpp
===================================================================
--- trunk/pingus/src/engine/display/surface.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/display/surface.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_SURFACE_HPP
-#define HEADER_PINGUS_PINGUS_SURFACE_HPP
+#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SURFACE_HPP
+#define HEADER_PINGUS_ENGINE_DISPLAY_SURFACE_HPP
 
 #include "SDL.h"
 #include <string>

Modified: trunk/pingus/src/engine/gui/button.hpp
===================================================================
--- trunk/pingus/src/engine/gui/button.hpp      2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/gui/button.hpp      2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_GUI_BUTTON_HPP
-#define HEADER_PINGUS_GUI_BUTTON_HPP
+#ifndef HEADER_PINGUS_ENGINE_GUI_BUTTON_HPP
+#define HEADER_PINGUS_ENGINE_GUI_BUTTON_HPP
 
 #include "pingus/pingus.hpp"
 

Modified: trunk/pingus/src/engine/gui/combobox_listener.hpp
===================================================================
--- trunk/pingus/src/engine/gui/combobox_listener.hpp   2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/gui/combobox_listener.hpp   2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_GUI_COMBOBOX_LISTENER_HPP
-#define HEADER_PINGUS_GUI_COMBOBOX_LISTENER_HPP
+#ifndef HEADER_PINGUS_ENGINE_GUI_COMBOBOX_LISTENER_HPP
+#define HEADER_PINGUS_ENGINE_GUI_COMBOBOX_LISTENER_HPP
 
 
 namespace GUI {

Modified: trunk/pingus/src/engine/gui/component.hpp
===================================================================
--- trunk/pingus/src/engine/gui/component.hpp   2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/gui/component.hpp   2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_GUI_COMPONENT_HPP
-#define HEADER_PINGUS_GUI_COMPONENT_HPP
+#ifndef HEADER_PINGUS_ENGINE_GUI_COMPONENT_HPP
+#define HEADER_PINGUS_ENGINE_GUI_COMPONENT_HPP
 
 #include "pingus/pingus.hpp"
 

Modified: trunk/pingus/src/engine/gui/game_delta_recorder.hpp
===================================================================
--- trunk/pingus/src/engine/gui/game_delta_recorder.hpp 2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/gui/game_delta_recorder.hpp 2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_GUI_GAME_DELTA_RECORDER_HPP
-#define HEADER_PINGUS_GUI_GAME_DELTA_RECORDER_HPP
+#ifndef HEADER_PINGUS_ENGINE_GUI_GAME_DELTA_RECORDER_HPP
+#define HEADER_PINGUS_ENGINE_GUI_GAME_DELTA_RECORDER_HPP
 
 
 class GameDeltaRecorder

Modified: trunk/pingus/src/engine/gui/group_component.hpp
===================================================================
--- trunk/pingus/src/engine/gui/group_component.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/gui/group_component.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_GUI_GROUP_COMPONENT_HPP
-#define HEADER_PINGUS_GUI_GROUP_COMPONENT_HPP
+#ifndef HEADER_PINGUS_ENGINE_GUI_GROUP_COMPONENT_HPP
+#define HEADER_PINGUS_ENGINE_GUI_GROUP_COMPONENT_HPP
 
 #include "engine/display/drawing_context.hpp"
 #include "engine/gui/rect_component.hpp"

Modified: trunk/pingus/src/engine/gui/gui_manager.hpp
===================================================================
--- trunk/pingus/src/engine/gui/gui_manager.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/gui/gui_manager.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_GUI_GUI_MANAGER_HPP
-#define HEADER_PINGUS_GUI_GUI_MANAGER_HPP
+#ifndef HEADER_PINGUS_ENGINE_GUI_GUI_MANAGER_HPP
+#define HEADER_PINGUS_ENGINE_GUI_GUI_MANAGER_HPP
 
 #include <vector>
 #include "engine/input/event.hpp"

Modified: trunk/pingus/src/engine/gui/rect_component.hpp
===================================================================
--- trunk/pingus/src/engine/gui/rect_component.hpp      2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/gui/rect_component.hpp      2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_GUI_RECT_COMPONENT_HPP
-#define HEADER_PINGUS_GUI_RECT_COMPONENT_HPP
+#ifndef HEADER_PINGUS_ENGINE_GUI_RECT_COMPONENT_HPP
+#define HEADER_PINGUS_ENGINE_GUI_RECT_COMPONENT_HPP
 
 #include "math/rect.hpp"
 #include "engine/gui/component.hpp"

Modified: trunk/pingus/src/engine/gui/surface_button.hpp
===================================================================
--- trunk/pingus/src/engine/gui/surface_button.hpp      2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/gui/surface_button.hpp      2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_GUI_SURFACE_BUTTON_HPP
-#define HEADER_PINGUS_GUI_SURFACE_BUTTON_HPP
+#ifndef HEADER_PINGUS_ENGINE_GUI_SURFACE_BUTTON_HPP
+#define HEADER_PINGUS_ENGINE_GUI_SURFACE_BUTTON_HPP
 
 #include "engine/display/sprite.hpp"
 #include "engine/gui/component.hpp"

Modified: trunk/pingus/src/engine/input/control.hpp
===================================================================
--- trunk/pingus/src/engine/input/control.hpp   2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/input/control.hpp   2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_CONTROL_HPP
-#define HEADER_PINGUS_INPUT_CONTROL_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_CONTROL_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_CONTROL_HPP
 
 #include <iostream>
 #include <vector>

Modified: trunk/pingus/src/engine/input/controller.hpp
===================================================================
--- trunk/pingus/src/engine/input/controller.hpp        2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/input/controller.hpp        2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_CONTROLLER_HPP
-#define HEADER_PINGUS_INPUT_CONTROLLER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_HPP
 
 #include <assert.h>
 #include "engine/input/event.hpp"

Modified: trunk/pingus/src/engine/input/controller_description.hpp
===================================================================
--- trunk/pingus/src/engine/input/controller_description.hpp    2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input/controller_description.hpp    2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_CONTROLLER_DESCRIPTION_HPP
-#define HEADER_PINGUS_INPUT_CONTROLLER_DESCRIPTION_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_DESCRIPTION_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_DESCRIPTION_HPP
 
 #include <map>
 #include <string>

Modified: trunk/pingus/src/engine/input/core_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/core_driver.hpp       2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/input/core_driver.hpp       2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_CORE_DRIVER_HPP
-#define HEADER_PINGUS_INPUT_CORE_DRIVER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_CORE_DRIVER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_CORE_DRIVER_HPP
 
 #include "engine/input/driver.hpp"
 

Modified: trunk/pingus/src/engine/input/driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/driver.hpp    2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/input/driver.hpp    2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_DRIVER_HPP
-#define HEADER_PINGUS_INPUT_DRIVER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_DRIVER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_DRIVER_HPP
 
 #include "util/file_reader.hpp"
 #include "engine/input/control.hpp"

Modified: trunk/pingus/src/engine/input/evdev/evdev_device.hpp
===================================================================
--- trunk/pingus/src/engine/input/evdev/evdev_device.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_EVDEV_DEVICE_HPP
-#define HEADER_PINGUS_INPUT_EVDEV_DEVICE_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_EVDEV_EVDEV_DEVICE_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_EVDEV_EVDEV_DEVICE_HPP
 
 #include <vector>
 #include <string.h>

Modified: trunk/pingus/src/engine/input/evdev/evdev_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/evdev/evdev_driver.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input/evdev/evdev_driver.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_EVDEV_DRIVER_HPP
-#define HEADER_PINGUS_INPUT_EVDEV_DRIVER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_EVDEV_EVDEV_DRIVER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_EVDEV_EVDEV_DRIVER_HPP
 
 #include "engine/input/driver.hpp"
 

Modified: trunk/pingus/src/engine/input/event.hpp
===================================================================
--- trunk/pingus/src/engine/input/event.hpp     2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/input/event.hpp     2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_EVENT_HPP
-#define HEADER_PINGUS_INPUT_EVENT_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_EVENT_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_EVENT_HPP
 
 #include <vector>
 #include <string>

Modified: trunk/pingus/src/engine/input/manager.hpp
===================================================================
--- trunk/pingus/src/engine/input/manager.hpp   2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/input/manager.hpp   2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_MANAGER_HPP
-#define HEADER_PINGUS_INPUT_MANAGER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_MANAGER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_MANAGER_HPP
 
 #include <vector>
 #include "engine/input/controller.hpp"

Modified: trunk/pingus/src/engine/input/sdl_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/sdl_driver.hpp        2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/input/sdl_driver.hpp        2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_SDL_DRIVER_HPP
-#define HEADER_PINGUS_INPUT_SDL_DRIVER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_SDL_DRIVER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_SDL_DRIVER_HPP
 
 #include <map>
 #include <vector>

Modified: trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp  2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp  2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_USBMOUSE_DRIVER_HPP
-#define HEADER_PINGUS_INPUT_USBMOUSE_DRIVER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_USBMOUSE_USBMOUSE_DRIVER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_USBMOUSE_USBMOUSE_DRIVER_HPP
 
 #include <vector>
 

Modified: trunk/pingus/src/engine/input/wiimote/wiimote.hpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote.hpp   2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/input/wiimote/wiimote.hpp   2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_WIIMOTE_HPP
-#define HEADER_PINGUS_INPUT_WIIMOTE_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_WIIMOTE_WIIMOTE_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_WIIMOTE_WIIMOTE_HPP
 
 #include <vector>
 #include <string>

Modified: trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp    2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp    2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_WIIMOTE_DRIVER_HPP
-#define HEADER_PINGUS_INPUT_WIIMOTE_DRIVER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_WIIMOTE_WIIMOTE_DRIVER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_WIIMOTE_WIIMOTE_DRIVER_HPP
 
 #include "engine/input/driver.hpp"
 

Modified: trunk/pingus/src/engine/input/xinput/xinput_device.hpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_device.hpp      2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input/xinput/xinput_device.hpp      2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_XINPUT_DEVICE_HPP
-#define HEADER_PINGUS_INPUT_XINPUT_DEVICE_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_XINPUT_XINPUT_DEVICE_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_XINPUT_XINPUT_DEVICE_HPP
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

Modified: trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_driver.hpp      2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.hpp      2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_XINPUT_DRIVER_HPP
-#define HEADER_PINGUS_INPUT_XINPUT_DRIVER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_XINPUT_XINPUT_DRIVER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_XINPUT_XINPUT_DRIVER_HPP
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

Modified: trunk/pingus/src/engine/input_old/axes/button_axis.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/axes/button_axis.hpp      2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/axes/button_axis.hpp      2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_BUTTON_AXIS_HXX
-#define HEADER_PINGUS_INPUT_BUTTON_AXIS_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_BUTTON_AXIS_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_BUTTON_AXIS_HPP
 
 #include "../axis.hpp"
 

Modified: trunk/pingus/src/engine/input_old/axes/dummy_axis.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/axes/dummy_axis.hpp       2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/axes/dummy_axis.hpp       2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_DUMMY_AXIS_HXX
-#define HEADER_PINGUS_INPUT_DUMMY_AXIS_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_DUMMY_AXIS_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_DUMMY_AXIS_HPP
 
 #include "../axis.hpp"
 

Modified: trunk/pingus/src/engine/input_old/axes/inverted_axis.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/axes/inverted_axis.hpp    2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/axes/inverted_axis.hpp    2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_INVERTED_AXIS_HXX
-#define HEADER_PINGUS_INPUT_INVERTED_AXIS_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_INVERTED_AXIS_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_INVERTED_AXIS_HPP
 
 #include "../axis.hpp"
 

Modified: trunk/pingus/src/engine/input_old/axes/joystick_axis.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/axes/joystick_axis.hpp    2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/axes/joystick_axis.hpp    2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_JOYSTICK_AXIS_HXX
-#define HEADER_PINGUS_INPUT_JOYSTICK_AXIS_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_JOYSTICK_AXIS_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_JOYSTICK_AXIS_HPP
 
 #include "../axis.hpp"
 

Modified: trunk/pingus/src/engine/input_old/axes/mouse_axis.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/axes/mouse_axis.hpp       2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/axes/mouse_axis.hpp       2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_MOUSE_AXIS_HXX
-#define HEADER_PINGUS_INPUT_MOUSE_AXIS_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_MOUSE_AXIS_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_MOUSE_AXIS_HPP
 
 #include "../axis.hpp"
 

Modified: trunk/pingus/src/engine/input_old/axes/multiple_axis.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/axes/multiple_axis.hpp    2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/axes/multiple_axis.hpp    2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_MULTIPLE_AXIS_HXX
-#define HEADER_PINGUS_INPUT_MULTIPLE_AXIS_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_MULTIPLE_AXIS_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_MULTIPLE_AXIS_HPP
 
 #include <vector>
 #include "../axis.hpp"

Modified: trunk/pingus/src/engine/input_old/axis.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/axis.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/input_old/axis.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_AXIS_HPP
-#define HEADER_PINGUS_INPUT_OLD_AXIS_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_AXIS_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_AXIS_HPP
 
 #include "pingus.hpp"
 

Modified: trunk/pingus/src/engine/input_old/axis_factory.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/axis_factory.hpp  2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/input_old/axis_factory.hpp  2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_AXIS_FACTORY_HPP
-#define HEADER_PINGUS_INPUT_OLD_AXIS_FACTORY_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_AXIS_FACTORY_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_AXIS_FACTORY_HPP
 
 #include "file_reader.hpp"
 

Modified: trunk/pingus/src/engine/input_old/button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/button.hpp        2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/input_old/button.hpp        2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_BUTTON_HPP
-#define HEADER_PINGUS_INPUT_OLD_BUTTON_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTON_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTON_HPP
 
 #include "pingus.hpp"
 #include "controller.hpp"

Modified: trunk/pingus/src/engine/input_old/button_factory.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/button_factory.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/button_factory.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_BUTTON_FACTORY_HPP
-#define HEADER_PINGUS_INPUT_OLD_BUTTON_FACTORY_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTON_FACTORY_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTON_FACTORY_HPP
 
 #include "file_reader.hpp"
 

Modified: trunk/pingus/src/engine/input_old/buttons/double_button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/double_button.hpp 2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/buttons/double_button.hpp 2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_DOUBLE_BUTTON_HXX
-#define HEADER_PINGUS_INPUT_DOUBLE_BUTTON_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_DOUBLE_BUTTON_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_DOUBLE_BUTTON_HPP
 
 #include "../button.hpp"
 

Modified: trunk/pingus/src/engine/input_old/buttons/dummy_button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/dummy_button.hpp  2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/buttons/dummy_button.hpp  2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_DUMMY_BUTTON_HXX
-#define HEADER_PINGUS_INPUT_DUMMY_BUTTON_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_DUMMY_BUTTON_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_DUMMY_BUTTON_HPP
 
 #include "../button.hpp"
 

Modified: trunk/pingus/src/engine/input_old/buttons/joystick_button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/joystick_button.hpp       
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/buttons/joystick_button.hpp       
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_JOYSTICK_BUTTON_HXX
-#define HEADER_PINGUS_INPUT_JOYSTICK_BUTTON_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_JOYSTICK_BUTTON_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_JOYSTICK_BUTTON_HPP
 
 #include "../button.hpp"
 

Modified: trunk/pingus/src/engine/input_old/buttons/key_button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/key_button.hpp    2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/buttons/key_button.hpp    2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_KEY_BUTTON_HXX
-#define HEADER_PINGUS_INPUT_KEY_BUTTON_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_KEY_BUTTON_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_KEY_BUTTON_HPP
 
 #include <string>
 #include "../button.hpp"

Modified: trunk/pingus/src/engine/input_old/buttons/mouse_button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/mouse_button.hpp  2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/buttons/mouse_button.hpp  2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_MOUSE_BUTTON_HXX
-#define HEADER_PINGUS_INPUT_MOUSE_BUTTON_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_MOUSE_BUTTON_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_MOUSE_BUTTON_HPP
 
 #include "../button.hpp"
 

Modified: trunk/pingus/src/engine/input_old/buttons/multiple_button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/multiple_button.hpp       
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/buttons/multiple_button.hpp       
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_MULTIPLE_BUTTON_HXX
-#define HEADER_PINGUS_INPUT_MULTIPLE_BUTTON_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_MULTIPLE_BUTTON_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_MULTIPLE_BUTTON_HPP
 
 #include <vector>
 #include "../button.hpp"

Modified: trunk/pingus/src/engine/input_old/buttons/triple_button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/triple_button.hpp 2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/buttons/triple_button.hpp 2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_TRIPLE_BUTTON_HXX
-#define HEADER_PINGUS_INPUT_TRIPLE_BUTTON_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_TRIPLE_BUTTON_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_TRIPLE_BUTTON_HPP
 
 #include "../button.hpp"
 

Modified: trunk/pingus/src/engine/input_old/controller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/controller.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/input_old/controller.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_CONTROLLER_HPP
-#define HEADER_PINGUS_INPUT_OLD_CONTROLLER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_CONTROLLER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_CONTROLLER_HPP
 
 #include <map>
 #include <list>

Modified: trunk/pingus/src/engine/input_old/event.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/event.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/input_old/event.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_EVENT_HPP
-#define HEADER_PINGUS_INPUT_OLD_EVENT_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_EVENT_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_EVENT_HPP
 
 #include <vector>
 #include <string>

Modified: trunk/pingus/src/engine/input_old/event_fwd.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/event_fwd.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/input_old/event_fwd.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_EVENT_FWD_HPP
-#define HEADER_PINGUS_INPUT_OLD_EVENT_FWD_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_EVENT_FWD_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_EVENT_FWD_HPP
 
 #include <vector>
 

Modified: trunk/pingus/src/engine/input_old/pointer.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointer.hpp       2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/input_old/pointer.hpp       2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_POINTER_HPP
-#define HEADER_PINGUS_INPUT_OLD_POINTER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_POINTER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_POINTER_HPP
 
 #include "pingus.hpp"
 

Modified: trunk/pingus/src/engine/input_old/pointer_factory.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointer_factory.hpp       2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/pointer_factory.hpp       2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_POINTER_FACTORY_HPP
-#define HEADER_PINGUS_INPUT_OLD_POINTER_FACTORY_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_POINTER_FACTORY_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_POINTER_FACTORY_HPP
 
 #include "file_reader.hpp"
 

Modified: trunk/pingus/src/engine/input_old/pointers/axis_pointer.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointers/axis_pointer.hpp 2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/pointers/axis_pointer.hpp 2009-11-06 
00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_AXIS_POINTER_HXX
-#define HEADER_PINGUS_INPUT_AXIS_POINTER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_AXIS_POINTER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_AXIS_POINTER_HPP
 
 #include <vector>
 #include "../pointer.hpp"

Modified: trunk/pingus/src/engine/input_old/pointers/dummy_pointer.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointers/dummy_pointer.hpp        
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/pointers/dummy_pointer.hpp        
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_DUMMY_POINTER_HXX
-#define HEADER_PINGUS_INPUT_DUMMY_POINTER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_DUMMY_POINTER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_DUMMY_POINTER_HPP
 
 #include "../pointer.hpp"
 

Modified: trunk/pingus/src/engine/input_old/pointers/mouse_pointer.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointers/mouse_pointer.hpp        
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/pointers/mouse_pointer.hpp        
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_MOUSE_POINTER_HXX
-#define HEADER_PINGUS_INPUT_MOUSE_POINTER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_MOUSE_POINTER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_MOUSE_POINTER_HPP
 
 #include "../pointer.hpp"
 #include "../controller.hpp"

Modified: trunk/pingus/src/engine/input_old/pointers/multiple_pointer.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointers/multiple_pointer.hpp     
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/pointers/multiple_pointer.hpp     
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_MULTIPLE_POINTER_HXX
-#define HEADER_PINGUS_INPUT_MULTIPLE_POINTER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_MULTIPLE_POINTER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_MULTIPLE_POINTER_HPP
 
 #include <vector>
 #include "../pointer.hpp"

Modified: trunk/pingus/src/engine/input_old/scroller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scroller.hpp      2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/input_old/scroller.hpp      2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_SCROLLER_HPP
-#define HEADER_PINGUS_INPUT_OLD_SCROLLER_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLER_HPP
 
 #include "pingus.hpp"
 

Modified: trunk/pingus/src/engine/input_old/scroller_factory.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scroller_factory.hpp      2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/scroller_factory.hpp      2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_INPUT_OLD_SCROLLER_FACTORY_HPP
-#define HEADER_PINGUS_INPUT_OLD_SCROLLER_FACTORY_HPP
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLER_FACTORY_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLER_FACTORY_HPP
 
 #include "file_reader.hpp"
 

Modified: trunk/pingus/src/engine/input_old/scrollers/axis_scroller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scrollers/axis_scroller.hpp       
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/scrollers/axis_scroller.hpp       
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_AXIS_SCROLLER_HXX
-#define HEADER_PINGUS_INPUT_AXIS_SCROLLER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_AXIS_SCROLLER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_AXIS_SCROLLER_HPP
 
 #include <vector>
 #include "../scroller.hpp"

Modified: trunk/pingus/src/engine/input_old/scrollers/dummy_scroller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scrollers/dummy_scroller.hpp      
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/scrollers/dummy_scroller.hpp      
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_DUMMY_SCROLLER_HXX
-#define HEADER_PINGUS_INPUT_DUMMY_SCROLLER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_DUMMY_SCROLLER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_DUMMY_SCROLLER_HPP
 
 #include "../scroller.hpp"
 

Modified: trunk/pingus/src/engine/input_old/scrollers/inverted_scroller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scrollers/inverted_scroller.hpp   
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/scrollers/inverted_scroller.hpp   
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_INVERTED_SCROLLER_HXX
-#define HEADER_PINGUS_INPUT_INVERTED_SCROLLER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_INVERTED_SCROLLER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_INVERTED_SCROLLER_HPP
 
 #include "../scroller.hpp"
 

Modified: trunk/pingus/src/engine/input_old/scrollers/joystick_scroller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scrollers/joystick_scroller.hpp   
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/scrollers/joystick_scroller.hpp   
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_JOYSTICK_SCROLLER_HXX
-#define HEADER_PINGUS_INPUT_JOYSTICK_SCROLLER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_JOYSTICK_SCROLLER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_JOYSTICK_SCROLLER_HPP
 
 #include "../scroller.hpp"
 

Modified: trunk/pingus/src/engine/input_old/scrollers/mouse_scroller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scrollers/mouse_scroller.hpp      
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/scrollers/mouse_scroller.hpp      
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_MOUSE_SCROLLER_HXX
-#define HEADER_PINGUS_INPUT_MOUSE_SCROLLER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_MOUSE_SCROLLER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_MOUSE_SCROLLER_HPP
 
 #include "../scroller.hpp"
 

Modified: trunk/pingus/src/engine/input_old/scrollers/multiple_scroller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scrollers/multiple_scroller.hpp   
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/scrollers/multiple_scroller.hpp   
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_MULTIPLE_SCROLLER_HXX
-#define HEADER_PINGUS_INPUT_MULTIPLE_SCROLLER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_MULTIPLE_SCROLLER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_MULTIPLE_SCROLLER_HPP
 
 #include <vector>
 #include "../scroller.hpp"

Modified: trunk/pingus/src/engine/input_old/scrollers/pointer_scroller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scrollers/pointer_scroller.hpp    
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/input_old/scrollers/pointer_scroller.hpp    
2009-11-06 00:28:22 UTC (rev 4050)
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_PINGUS_INPUT_POINTER_SCROLLER_HXX
-#define HEADER_PINGUS_INPUT_POINTER_SCROLLER_HXX
+#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_POINTER_SCROLLER_HPP
+#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_POINTER_SCROLLER_HPP
 
 #include "../scroller.hpp"
 

Modified: trunk/pingus/src/engine/screen/gui_screen.hpp
===================================================================
--- trunk/pingus/src/engine/screen/gui_screen.hpp       2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/screen/gui_screen.hpp       2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_SCREEN_GUI_SCREEN_HPP
-#define HEADER_PINGUS_SCREEN_GUI_SCREEN_HPP
+#ifndef HEADER_PINGUS_ENGINE_SCREEN_GUI_SCREEN_HPP
+#define HEADER_PINGUS_ENGINE_SCREEN_GUI_SCREEN_HPP
 
 #include "engine/screen/screen.hpp"
 

Modified: trunk/pingus/src/engine/screen/screen.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen.hpp   2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/screen/screen.hpp   2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_SCREEN_SCREEN_HPP
-#define HEADER_PINGUS_SCREEN_SCREEN_HPP
+#ifndef HEADER_PINGUS_ENGINE_SCREEN_SCREEN_HPP
+#define HEADER_PINGUS_ENGINE_SCREEN_SCREEN_HPP
 
 #include "SDL.h"
 #include "math/size.hpp"

Modified: trunk/pingus/src/engine/screen/screen_manager.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager.hpp   2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/screen/screen_manager.hpp   2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_SCREEN_SCREEN_MANAGER_HPP
-#define HEADER_PINGUS_SCREEN_SCREEN_MANAGER_HPP
+#ifndef HEADER_PINGUS_ENGINE_SCREEN_SCREEN_MANAGER_HPP
+#define HEADER_PINGUS_ENGINE_SCREEN_SCREEN_MANAGER_HPP
 
 #include "pingus/pingus.hpp"
 #include <memory>

Modified: trunk/pingus/src/engine/screen/screen_manager_impl.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager_impl.hpp      2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/engine/screen/screen_manager_impl.hpp      2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_SCREEN_SCREEN_MANAGER_IMPL_HPP
-#define HEADER_PINGUS_SCREEN_SCREEN_MANAGER_IMPL_HPP
+#ifndef HEADER_PINGUS_ENGINE_SCREEN_SCREEN_MANAGER_IMPL_HPP
+#define HEADER_PINGUS_ENGINE_SCREEN_SCREEN_MANAGER_IMPL_HPP
 
 #include "engine/screen/pingus.hpp"
 

Modified: trunk/pingus/src/engine/sound/sound.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound.hpp     2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/engine/sound/sound.hpp     2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_SOUND_SOUND_HPP
-#define HEADER_PINGUS_SOUND_SOUND_HPP
+#ifndef HEADER_PINGUS_ENGINE_SOUND_SOUND_HPP
+#define HEADER_PINGUS_ENGINE_SOUND_SOUND_HPP
 
 #include <string>
 #include "engine/sound/sound_impl.hpp"

Modified: trunk/pingus/src/engine/sound/sound_dummy.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_dummy.hpp       2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/sound/sound_dummy.hpp       2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_SOUND_SOUND_DUMMY_HPP
-#define HEADER_PINGUS_SOUND_SOUND_DUMMY_HPP
+#ifndef HEADER_PINGUS_ENGINE_SOUND_SOUND_DUMMY_HPP
+#define HEADER_PINGUS_ENGINE_SOUND_SOUND_DUMMY_HPP
 
 #include "engine/sound/sound_impl.hpp"
 #include "engine/sound/sound.hpp"

Modified: trunk/pingus/src/engine/sound/sound_impl.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_impl.hpp        2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/sound/sound_impl.hpp        2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_SOUND_SOUND_IMPL_HPP
-#define HEADER_PINGUS_SOUND_SOUND_IMPL_HPP
+#ifndef HEADER_PINGUS_ENGINE_SOUND_SOUND_IMPL_HPP
+#define HEADER_PINGUS_ENGINE_SOUND_SOUND_IMPL_HPP
 
 #include <string>
 

Modified: trunk/pingus/src/engine/sound/sound_real.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_real.hpp        2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/sound/sound_real.hpp        2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_SOUND_SOUND_REAL_HPP
-#define HEADER_PINGUS_SOUND_SOUND_REAL_HPP
+#ifndef HEADER_PINGUS_ENGINE_SOUND_SOUND_REAL_HPP
+#define HEADER_PINGUS_ENGINE_SOUND_SOUND_REAL_HPP
 
 #include "SDL_mixer.h"
 #include <config.h>

Modified: trunk/pingus/src/engine/sound/sound_res_mgr.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_res_mgr.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/engine/sound/sound_res_mgr.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_SOUND_SOUND_RES_MGR_HPP
-#define HEADER_PINGUS_SOUND_SOUND_RES_MGR_HPP
+#ifndef HEADER_PINGUS_ENGINE_SOUND_SOUND_RES_MGR_HPP
+#define HEADER_PINGUS_ENGINE_SOUND_SOUND_RES_MGR_HPP
 
 #include <map>
 #include <string>

Modified: trunk/pingus/src/math/size.hpp
===================================================================
--- trunk/pingus/src/math/size.hpp      2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/math/size.hpp      2009-11-06 00:28:22 UTC (rev 4050)
@@ -30,8 +30,8 @@
 //! clanCore="Math"
 //! header=core.h
 
-#ifndef HEADER_GALAPIX_MATH_SIZE_HPP
-#define HEADER_GALAPIX_MATH_SIZE_HPP
+#ifndef HEADER_PINGUS_MATH_SIZE_HPP
+#define HEADER_PINGUS_MATH_SIZE_HPP
 
 #if _MSC_VER > 1000
 #pragma once

Modified: trunk/pingus/src/pingus/actions/angel.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/angel.hpp   2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/angel.hpp   2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_ANGEL_HPP
-#define HEADER_PINGUS_ACTIONS_ANGEL_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_ANGEL_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_ANGEL_HPP
 
 #include "pingus/pingu_action.hpp"
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/actions/basher.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/basher.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/basher.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_BASHER_HPP
-#define HEADER_PINGUS_ACTIONS_BASHER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_BASHER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_BASHER_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/blocker.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/blocker.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/blocker.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_BLOCKER_HPP
-#define HEADER_PINGUS_ACTIONS_BLOCKER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_BLOCKER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_BLOCKER_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/boarder.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/boarder.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/boarder.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_BOARDER_HPP
-#define HEADER_PINGUS_ACTIONS_BOARDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_BOARDER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_BOARDER_HPP
 
 #include "pingus/pingu_action.hpp"
 #include "pingus/state_sprite.hpp"

Modified: trunk/pingus/src/pingus/actions/bomber.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/bomber.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_BOMBER_HPP
-#define HEADER_PINGUS_ACTIONS_BOMBER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_BOMBER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_BOMBER_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/bridger.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/bridger.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/bridger.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_BRIDGER_HPP
-#define HEADER_PINGUS_ACTIONS_BRIDGER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_BRIDGER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_BRIDGER_HPP
 
 #include "math/vector3f.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/climber.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/climber.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/climber.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_CLIMBER_HPP
-#define HEADER_PINGUS_ACTIONS_CLIMBER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_CLIMBER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_CLIMBER_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/digger.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/digger.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/digger.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_DIGGER_HPP
-#define HEADER_PINGUS_ACTIONS_DIGGER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_DIGGER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_DIGGER_HPP
 
 #include "engine/display/sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/drown.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/drown.hpp   2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/drown.hpp   2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_DROWN_HPP
-#define HEADER_PINGUS_ACTIONS_DROWN_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_DROWN_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_DROWN_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/exiter.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/exiter.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/exiter.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_EXITER_HPP
-#define HEADER_PINGUS_ACTIONS_EXITER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_EXITER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_EXITER_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/faller.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/faller.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/faller.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_FALLER_HPP
-#define HEADER_PINGUS_ACTIONS_FALLER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_FALLER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_FALLER_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/floater.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/floater.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/floater.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_FLOATER_HPP
-#define HEADER_PINGUS_ACTIONS_FLOATER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_FLOATER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_FLOATER_HPP
 
 #include "pingus/pingu_action.hpp"
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/actions/jumper.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/jumper.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/jumper.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_JUMPER_HPP
-#define HEADER_PINGUS_ACTIONS_JUMPER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_JUMPER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_JUMPER_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/laser_kill.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/laser_kill.hpp      2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/actions/laser_kill.hpp      2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_LASER_KILL_HPP
-#define HEADER_PINGUS_ACTIONS_LASER_KILL_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_LASER_KILL_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_LASER_KILL_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/miner.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/miner.hpp   2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/miner.hpp   2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_MINER_HPP
-#define HEADER_PINGUS_ACTIONS_MINER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_MINER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_MINER_HPP
 
 #include "pingus/pingu_action.hpp"
 #include "pingus/state_sprite.hpp"

Modified: trunk/pingus/src/pingus/actions/rocket_launcher.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/rocket_launcher.hpp 2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/actions/rocket_launcher.hpp 2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_ROCKET_LAUNCHER_HPP
-#define HEADER_PINGUS_ACTIONS_ROCKET_LAUNCHER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_ROCKET_LAUNCHER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_ROCKET_LAUNCHER_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/slider.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/slider.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/slider.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_SLIDER_HPP
-#define HEADER_PINGUS_ACTIONS_SLIDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_SLIDER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_SLIDER_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/smashed.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/smashed.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/smashed.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_SMASHED_HPP
-#define HEADER_PINGUS_ACTIONS_SMASHED_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_SMASHED_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_SMASHED_HPP
 
 #include "engine/display/sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/splashed.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/splashed.hpp        2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/actions/splashed.hpp        2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_SPLASHED_HPP
-#define HEADER_PINGUS_ACTIONS_SPLASHED_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_SPLASHED_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_SPLASHED_HPP
 
 #include "pingus/pingu_action.hpp"
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/actions/superman.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/superman.hpp        2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/actions/superman.hpp        2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_SUPERMAN_HPP
-#define HEADER_PINGUS_ACTIONS_SUPERMAN_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_SUPERMAN_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_SUPERMAN_HPP
 
 #include "engine/display/sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/waiter.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/waiter.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/waiter.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_WAITER_HPP
-#define HEADER_PINGUS_ACTIONS_WAITER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_WAITER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_WAITER_HPP
 
 #include "engine/display/sprite.hpp"
 #include "pingus/pingu_action.hpp"

Modified: trunk/pingus/src/pingus/actions/walker.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/walker.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/actions/walker.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_ACTIONS_WALKER_HPP
-#define HEADER_PINGUS_ACTIONS_WALKER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTIONS_WALKER_HPP
+#define HEADER_PINGUS_PINGUS_ACTIONS_WALKER_HPP
 
 #include "pingus/pingu_action.hpp"
 #include "pingus/state_sprite.hpp"

Modified: trunk/pingus/src/pingus/colliders/pingu_collider.hpp
===================================================================
--- trunk/pingus/src/pingus/colliders/pingu_collider.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/colliders/pingu_collider.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COLLIDERS_PINGU_COLLIDER_HPP
-#define HEADER_PINGUS_COLLIDERS_PINGU_COLLIDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_COLLIDERS_PINGU_COLLIDER_HPP
+#define HEADER_PINGUS_PINGUS_COLLIDERS_PINGU_COLLIDER_HPP
 
 #include "pingus/collider.hpp"
 

Modified: trunk/pingus/src/pingus/components/action_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/components/action_button.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_ACTION_BUTTON_HPP
-#define HEADER_PINGUS_COMPONENTS_ACTION_BUTTON_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_ACTION_BUTTON_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_ACTION_BUTTON_HPP
 
 #include <string>
 #include "engine/display/font.hpp"

Modified: trunk/pingus/src/pingus/components/button_panel.hpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_BUTTON_PANEL_HPP
-#define HEADER_PINGUS_COMPONENTS_BUTTON_PANEL_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_BUTTON_PANEL_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_BUTTON_PANEL_HPP
 
 #include <vector>
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/components/check_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/check_box.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/components/check_box.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_CHECK_BOX_HPP
-#define HEADER_PINGUS_COMPONENTS_CHECK_BOX_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
 
 #include <boost/signal.hpp>
 #include <string>

Modified: trunk/pingus/src/pingus/components/choice_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/choice_box.hpp   2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/components/choice_box.hpp   2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_CHOICE_BOX_HPP
-#define HEADER_PINGUS_COMPONENTS_CHOICE_BOX_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
 
 #include <string>
 #include <vector>

Modified: trunk/pingus/src/pingus/components/label.hpp
===================================================================
--- trunk/pingus/src/pingus/components/label.hpp        2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/components/label.hpp        2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_LABEL_HPP
-#define HEADER_PINGUS_COMPONENTS_LABEL_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_LABEL_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_LABEL_HPP
 
 #include <string>
 #include "engine/display/font.hpp"

Modified: trunk/pingus/src/pingus/components/menu_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.hpp  2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/components/menu_button.hpp  2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_MENU_BUTTON_HPP
-#define HEADER_PINGUS_COMPONENTS_MENU_BUTTON_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_MENU_BUTTON_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_MENU_BUTTON_HPP
 
 #include <string>
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/components/pingus_counter.hpp
===================================================================
--- trunk/pingus/src/pingus/components/pingus_counter.hpp       2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/components/pingus_counter.hpp       2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_PINGUS_COUNTER_HPP
-#define HEADER_PINGUS_COMPONENTS_PINGUS_COUNTER_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_PINGUS_COUNTER_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_PINGUS_COUNTER_HPP
 
 #include "engine/gui/component.hpp"
 #include "engine/display/font.hpp"

Modified: trunk/pingus/src/pingus/components/playfield.hpp
===================================================================
--- trunk/pingus/src/pingus/components/playfield.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/components/playfield.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_PLAYFIELD_HPP
-#define HEADER_PINGUS_COMPONENTS_PLAYFIELD_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_PLAYFIELD_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_PLAYFIELD_HPP
 
 #include <memory>
 #include "pingus/graphic_context_state.hpp"

Modified: trunk/pingus/src/pingus/components/slider_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/slider_box.hpp   2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/components/slider_box.hpp   2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_SLIDER_BOX_HPP
-#define HEADER_PINGUS_COMPONENTS_SLIDER_BOX_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
 
 #include <string>
 #include <boost/signal.hpp>

Modified: trunk/pingus/src/pingus/components/smallmap.hpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/components/smallmap.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_SMALLMAP_HPP
-#define HEADER_PINGUS_COMPONENTS_SMALLMAP_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_SMALLMAP_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_SMALLMAP_HPP
 
 #include "engine/display/sprite.hpp"
 #include "engine/gui/rect_component.hpp"

Modified: trunk/pingus/src/pingus/components/time_display.hpp
===================================================================
--- trunk/pingus/src/pingus/components/time_display.hpp 2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/components/time_display.hpp 2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
-#define HEADER_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
+#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
+#define HEADER_PINGUS_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
 
 #include "engine/gui/component.hpp"
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/movers/linear_mover.hpp
===================================================================
--- trunk/pingus/src/pingus/movers/linear_mover.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/movers/linear_mover.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_MOVERS_LINEAR_MOVER_HPP
-#define HEADER_PINGUS_MOVERS_LINEAR_MOVER_HPP
+#ifndef HEADER_PINGUS_PINGUS_MOVERS_LINEAR_MOVER_HPP
+#define HEADER_PINGUS_PINGUS_MOVERS_LINEAR_MOVER_HPP
 
 #include "pingus/mover.hpp"
 

Modified: trunk/pingus/src/pingus/particles/explosive_particle.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/explosive_particle.hpp    2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/particles/explosive_particle.hpp    2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if 0
-#ifndef HEADER_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
-#define HEADER_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
+#ifndef HEADER_PINGUS_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
+#define HEADER_PINGUS_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
 
 #include "engine/display/sprite.hpp"
 #include "pingus/particles/particle.hpp"

Modified: trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp 2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp 2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PARTICLES_PINGU_PARTICLE_HOLDER_HPP
-#define HEADER_PINGUS_PARTICLES_PINGU_PARTICLE_HOLDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_PARTICLES_PINGU_PARTICLE_HOLDER_HPP
+#define HEADER_PINGUS_PINGUS_PARTICLES_PINGU_PARTICLE_HOLDER_HPP
 
 #include <vector>
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/particles/rain_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/rain_particle_holder.hpp  2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/particles/rain_particle_holder.hpp  2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PARTICLES_RAIN_PARTICLE_HOLDER_HPP
-#define HEADER_PINGUS_PARTICLES_RAIN_PARTICLE_HOLDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_PARTICLES_RAIN_PARTICLE_HOLDER_HPP
+#define HEADER_PINGUS_PINGUS_PARTICLES_RAIN_PARTICLE_HOLDER_HPP
 
 #include <vector>
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp 2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp 2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PARTICLES_SMOKE_PARTICLE_HOLDER_HPP
-#define HEADER_PINGUS_PARTICLES_SMOKE_PARTICLE_HOLDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_PARTICLES_SMOKE_PARTICLE_HOLDER_HPP
+#define HEADER_PINGUS_PINGUS_PARTICLES_SMOKE_PARTICLE_HOLDER_HPP
 
 #include <vector>
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/particles/snow_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/snow_particle_holder.hpp  2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/particles/snow_particle_holder.hpp  2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PARTICLES_SNOW_PARTICLE_HOLDER_HPP
-#define HEADER_PINGUS_PARTICLES_SNOW_PARTICLE_HOLDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_PARTICLES_SNOW_PARTICLE_HOLDER_HPP
+#define HEADER_PINGUS_PINGUS_PARTICLES_SNOW_PARTICLE_HOLDER_HPP
 
 #include <vector>
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/screens/addon_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/addon_menu.hpp      2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/screens/addon_menu.hpp      2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_ADDON_MENU_HPP
-#define HEADER_PINGUS_PINGUS_ADDON_MENU_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_ADDON_MENU_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_ADDON_MENU_HPP
 
 #include "engine/display/sprite.hpp"
 #include "engine/screen/gui_screen.hpp"

Modified: trunk/pingus/src/pingus/screens/credits.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/credits.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/screens/credits.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_CREDITS_HPP
-#define HEADER_PINGUS_PINGUS_CREDITS_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_CREDITS_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_CREDITS_HPP
 
 #include <string>
 #include <vector>

Modified: trunk/pingus/src/pingus/screens/demo_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/screens/demo_session.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_DEMO_SESSION_HPP
-#define HEADER_PINGUS_PINGUS_DEMO_SESSION_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_DEMO_SESSION_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_DEMO_SESSION_HPP
 
 #include <memory>
 #include <vector>

Modified: trunk/pingus/src/pingus/screens/font_test_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/font_test_screen.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/screens/font_test_screen.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_FONT_TEST_SCREEN_HPP
-#define HEADER_PINGUS_PINGUS_FONT_TEST_SCREEN_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_FONT_TEST_SCREEN_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_FONT_TEST_SCREEN_HPP
 
 #include "engine/screen/screen.hpp"
 #include "engine/display/font.hpp"

Modified: trunk/pingus/src/pingus/screens/game_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/screens/game_session.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_GAME_SESSION_HPP
-#define HEADER_PINGUS_PINGUS_GAME_SESSION_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_GAME_SESSION_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_GAME_SESSION_HPP
 
 #include <string>
 #include <memory>

Modified: trunk/pingus/src/pingus/screens/level_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/level_menu.hpp      2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/screens/level_menu.hpp      2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_LEVEL_MENU_HPP
-#define HEADER_PINGUS_PINGUS_LEVEL_MENU_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_LEVEL_MENU_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_LEVEL_MENU_HPP
 
 #include "pingus/levelset.hpp"
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/screens/option_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/option_menu.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/screens/option_menu.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_OPTION_MENU_HPP
-#define HEADER_PINGUS_PINGUS_OPTION_MENU_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
 
 #include <vector>
 #include <map>

Modified: trunk/pingus/src/pingus/screens/pingus_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/pingus_menu.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/screens/pingus_menu.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_PINGUS_MENU_HPP
-#define HEADER_PINGUS_PINGUS_PINGUS_MENU_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_PINGUS_MENU_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_PINGUS_MENU_HPP
 
 #include <vector>
 #include <memory>

Modified: trunk/pingus/src/pingus/screens/result_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/result_screen.hpp   2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/screens/result_screen.hpp   2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_RESULT_SCREEN_HPP
-#define HEADER_PINGUS_PINGUS_RESULT_SCREEN_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_RESULT_SCREEN_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_RESULT_SCREEN_HPP
 
 #include "pingus/result.hpp"
 #include "engine/screen/gui_screen.hpp"

Modified: trunk/pingus/src/pingus/screens/start_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/start_screen.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/screens/start_screen.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_START_SCREEN_HPP
-#define HEADER_PINGUS_PINGUS_START_SCREEN_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_START_SCREEN_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_START_SCREEN_HPP
 
 #include "pingus/pingus_level.hpp"
 #include "engine/screen/gui_screen.hpp"

Modified: trunk/pingus/src/pingus/screens/story_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/screens/story_screen.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_STORY_SCREEN_HPP
-#define HEADER_PINGUS_PINGUS_STORY_SCREEN_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENS_STORY_SCREEN_HPP
+#define HEADER_PINGUS_PINGUS_SCREENS_STORY_SCREEN_HPP
 
 #include <string>
 #include <memory>

Modified: trunk/pingus/src/pingus/smallmap_image.hpp
===================================================================
--- trunk/pingus/src/pingus/smallmap_image.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/smallmap_image.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -50,6 +50,7 @@
   
   /** Regenerate the smallmap surface */
   void update_surface();
+
 private:
   SmallMapImage (const SmallMapImage&);
   SmallMapImage& operator= (const SmallMapImage&);

Modified: trunk/pingus/src/pingus/worldmap/dot.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot.hpp    2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/worldmap/dot.hpp    2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_DOT_HPP
-#define HEADER_PINGUS_WORLDMAP_DOT_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_DOT_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_DOT_HPP
 
 #include <string>
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldmap/dot_factory.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot_factory.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldmap/dot_factory.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_DOT_FACTORY_HPP
-#define HEADER_PINGUS_WORLDMAP_DOT_FACTORY_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_DOT_FACTORY_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_DOT_FACTORY_HPP
 
 #include "util/file_reader.hpp"
 

Modified: trunk/pingus/src/pingus/worldmap/drawable.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable.hpp       2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldmap/drawable.hpp       2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_DRAWABLE_HPP
-#define HEADER_PINGUS_WORLDMAP_DRAWABLE_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_DRAWABLE_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_DRAWABLE_HPP
 
 #include "pingus/pingus_error.hpp"
 #include "util/file_reader.hpp"

Modified: trunk/pingus/src/pingus/worldmap/drawable_factory.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable_factory.hpp       2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldmap/drawable_factory.hpp       2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_DRAWABLE_FACTORY_HPP
-#define HEADER_PINGUS_WORLDMAP_DRAWABLE_FACTORY_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_DRAWABLE_FACTORY_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_DRAWABLE_FACTORY_HPP
 
 #include "pingus/worldmap/drawable.hpp"
 

Modified: trunk/pingus/src/pingus/worldmap/graph.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/graph.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/worldmap/graph.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_GRAPH_HPP
-#define HEADER_PINGUS_WORLDMAP_GRAPH_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_GRAPH_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_GRAPH_HPP
 
 #include <algorithm>
 #include <assert.h>

Modified: trunk/pingus/src/pingus/worldmap/level_dot.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/level_dot.hpp      2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldmap/level_dot.hpp      2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_LEVEL_DOT_HPP
-#define HEADER_PINGUS_WORLDMAP_LEVEL_DOT_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_LEVEL_DOT_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_LEVEL_DOT_HPP
 
 #include "engine/display/sprite.hpp"
 #include "pingus/pingus_level.hpp"

Modified: trunk/pingus/src/pingus/worldmap/path.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path.hpp   2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/worldmap/path.hpp   2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_PATH_HPP
-#define HEADER_PINGUS_WORLDMAP_PATH_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_PATH_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_PATH_HPP
 
 #include <algorithm>
 #include <vector>

Modified: trunk/pingus/src/pingus/worldmap/path_drawable.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_drawable.hpp  2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldmap/path_drawable.hpp  2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_PATH_DRAWABLE_HPP
-#define HEADER_PINGUS_WORLDMAP_PATH_DRAWABLE_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_PATH_DRAWABLE_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_PATH_DRAWABLE_HPP
 
 #include "pingus/worldmap/drawable.hpp"
 #include "pingus/worldmap/path_graph.hpp"

Modified: trunk/pingus/src/pingus/worldmap/path_graph.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_graph.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldmap/path_graph.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_PATH_GRAPH_HPP
-#define HEADER_PINGUS_WORLDMAP_PATH_GRAPH_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_PATH_GRAPH_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_PATH_GRAPH_HPP
 
 #include <map>
 #include <vector>

Modified: trunk/pingus/src/pingus/worldmap/pathfinder.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pathfinder.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldmap/pathfinder.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_PATHFINDER_HPP
-#define HEADER_PINGUS_WORLDMAP_PATHFINDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_PATHFINDER_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_PATHFINDER_HPP
 
 #include <queue>
 #include "pingus/worldmap/graph.hpp"

Modified: trunk/pingus/src/pingus/worldmap/pingus.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/worldmap/pingus.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_PINGUS_HPP
-#define HEADER_PINGUS_WORLDMAP_PINGUS_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_PINGUS_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_PINGUS_HPP
 
 #include "pingus/state_sprite.hpp"
 #include "pingus/worldmap/drawable.hpp"

Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_PINGUS_WORLDMAP_HPP
-#define HEADER_PINGUS_WORLDMAP_PINGUS_WORLDMAP_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_PINGUS_WORLDMAP_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_PINGUS_WORLDMAP_HPP
 
 #include <boost/smart_ptr.hpp>
 

Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_SPRITE_DRAWABLE_HPP
-#define HEADER_PINGUS_WORLDMAP_SPRITE_DRAWABLE_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_SPRITE_DRAWABLE_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_SPRITE_DRAWABLE_HPP
 
 #include "engine/display/sprite.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldmap/worldmap.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap.hpp       2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldmap/worldmap.hpp       2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_WORLDMAP_HPP
-#define HEADER_PINGUS_WORLDMAP_WORLDMAP_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_HPP
 
 #include <vector>
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.hpp     2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.hpp     2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_WORLDMAP_COMPONENT_HPP
-#define HEADER_PINGUS_WORLDMAP_WORLDMAP_COMPONENT_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_COMPONENT_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_COMPONENT_HPP
 
 #include <string>
 #include <memory>

Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_WORLDMAP_SCREEN_HPP
-#define HEADER_PINGUS_WORLDMAP_WORLDMAP_SCREEN_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_SCREEN_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_SCREEN_HPP
 
 #include <string>
 #include <memory>

Modified: trunk/pingus/src/pingus/worldmap/worldmap_story.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_story.hpp 2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldmap/worldmap_story.hpp 2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDMAP_WORLDMAP_STORY_HPP
-#define HEADER_PINGUS_WORLDMAP_WORLDMAP_STORY_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_STORY_HPP
+#define HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_STORY_HPP
 
 #include <vector>
 #include <string>

Modified: trunk/pingus/src/pingus/worldobjs/conveyor_belt.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/conveyor_belt.hpp 2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/conveyor_belt.hpp 2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_CONVEYOR_BELT_HPP
-#define HEADER_PINGUS_WORLDOBJS_CONVEYOR_BELT_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_CONVEYOR_BELT_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_CONVEYOR_BELT_HPP
 
 #include "math/vector3f.hpp"
 #include "pingus/worldobj.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/entrance.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/entrance.hpp      2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/entrance.hpp      2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_ENTRANCE_HPP
-#define HEADER_PINGUS_WORLDOBJS_ENTRANCE_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_ENTRANCE_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_ENTRANCE_HPP
 
 #include "math/vector3f.hpp"
 #include "pingus/res_descriptor.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/exit.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/exit.hpp  2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/worldobjs/exit.hpp  2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_EXIT_HPP
-#define HEADER_PINGUS_WORLDOBJS_EXIT_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_EXIT_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_EXIT_HPP
 
 #include "math/vector3f.hpp"
 #include "pingus/res_descriptor.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/fake_exit.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/fake_exit.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/fake_exit.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_FAKE_EXIT_HPP
-#define HEADER_PINGUS_WORLDOBJS_FAKE_EXIT_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_FAKE_EXIT_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_FAKE_EXIT_HPP
 
 #include "pingus/worldobj.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/groundpiece.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/groundpiece.hpp   2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/groundpiece.hpp   2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_GROUNDPIECE_HPP
-#define HEADER_PINGUS_WORLDOBJS_GROUNDPIECE_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_GROUNDPIECE_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_GROUNDPIECE_HPP
 
 #include "pingus/res_descriptor.hpp"
 #include "pingus/groundtype.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/guillotine.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/guillotine.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/guillotine.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_GUILLOTINE_HPP
-#define HEADER_PINGUS_WORLDOBJS_GUILLOTINE_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_GUILLOTINE_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_GUILLOTINE_HPP
 
 #include "pingus/direction.hpp"
 #include "pingus/worldobj.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/hammer.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hammer.hpp        2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/hammer.hpp        2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_HAMMER_HPP
-#define HEADER_PINGUS_WORLDOBJS_HAMMER_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_HAMMER_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_HAMMER_HPP
 
 #include "pingus/worldobj.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/hotspot.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hotspot.hpp       2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/hotspot.hpp       2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_HOTSPOT_HPP
-#define HEADER_PINGUS_WORLDOBJS_HOTSPOT_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_HOTSPOT_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_HOTSPOT_HPP
 
 #include "pingus/worldobj.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/ice_block.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/ice_block.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/ice_block.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_ICE_BLOCK_HPP
-#define HEADER_PINGUS_WORLDOBJS_ICE_BLOCK_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_ICE_BLOCK_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_ICE_BLOCK_HPP
 
 #include "pingus/worldobj.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/laser_exit.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/laser_exit.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/laser_exit.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_LASER_EXIT_HPP
-#define HEADER_PINGUS_WORLDOBJS_LASER_EXIT_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_LASER_EXIT_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_LASER_EXIT_HPP
 
 #include "pingus/worldobj.hpp"
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/liquid.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/liquid.hpp        2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/liquid.hpp        2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_LIQUID_HPP
-#define HEADER_PINGUS_WORLDOBJS_LIQUID_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_LIQUID_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_LIQUID_HPP
 
 #include "pingus/res_descriptor.hpp"
 #include "pingus/worldobj.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/rain_generator.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/rain_generator.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/rain_generator.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_RAIN_GENERATOR_HPP
-#define HEADER_PINGUS_WORLDOBJS_RAIN_GENERATOR_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_RAIN_GENERATOR_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_RAIN_GENERATOR_HPP
 
 #include "pingus/worldobj.hpp"
 

Modified: trunk/pingus/src/pingus/worldobjs/smasher.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/smasher.hpp       2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/smasher.hpp       2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_SMASHER_HPP
-#define HEADER_PINGUS_WORLDOBJS_SMASHER_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_SMASHER_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_SMASHER_HPP
 
 #include "pingus/worldobj.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/snow_generator.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/snow_generator.hpp        2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/snow_generator.hpp        2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_SNOW_GENERATOR_HPP
-#define HEADER_PINGUS_WORLDOBJS_SNOW_GENERATOR_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_SNOW_GENERATOR_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_SNOW_GENERATOR_HPP
 
 #include "pingus/worldobj.hpp"
 

Modified: trunk/pingus/src/pingus/worldobjs/solid_color_background.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/solid_color_background.hpp        
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/solid_color_background.hpp        
2009-11-06 00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_SOLID_COLOR_BACKGROUND_HPP
-#define HEADER_PINGUS_WORLDOBJS_SOLID_COLOR_BACKGROUND_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_SOLID_COLOR_BACKGROUND_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_SOLID_COLOR_BACKGROUND_HPP
 
 #include "math/color.hpp"
 #include "pingus/worldobj.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/spike.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/spike.hpp 2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/pingus/worldobjs/spike.hpp 2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_SPIKE_HPP
-#define HEADER_PINGUS_WORLDOBJS_SPIKE_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_SPIKE_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_SPIKE_HPP
 
 #include "pingus/worldobj.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/starfield_background.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background.hpp  2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background.hpp  2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_HPP
-#define HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_HPP
 
 #include <vector>
 #include "pingus/worldobj.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/starfield_background_stars.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background_stars.hpp    
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background_stars.hpp    
2009-11-06 00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_STARS_HPP
-#define HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_STARS_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_STARS_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_STARS_HPP
 
 #include "pingus/worldobj.hpp"
 #include "engine/display/sprite.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/surface_background.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/surface_background.hpp    2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/surface_background.hpp    2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HPP
-#define HEADER_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HPP
 
 #include "pingus/res_descriptor.hpp"
 #include "pingus/worldobj.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/switch_door.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/switch_door.hpp   2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/switch_door.hpp   2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_SWITCH_DOOR_HPP
-#define HEADER_PINGUS_WORLDOBJS_SWITCH_DOOR_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_SWITCH_DOOR_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_SWITCH_DOOR_HPP
 
 #include "pingus/worldobj.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/teleporter.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter.hpp    2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/teleporter.hpp    2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_TELEPORTER_HPP
-#define HEADER_PINGUS_WORLDOBJS_TELEPORTER_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_TELEPORTER_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_TELEPORTER_HPP
 
 #include "pingus/worldobj.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/teleporter_target.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter_target.hpp     2009-11-06 
00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/teleporter_target.hpp     2009-11-06 
00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_TELEPORTER_TARGET_HPP
-#define HEADER_PINGUS_WORLDOBJS_TELEPORTER_TARGET_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_TELEPORTER_TARGET_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_TELEPORTER_TARGET_HPP
 
 #include "pingus/worldobj.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/thunderstorm_background.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/thunderstorm_background.hpp       
2009-11-06 00:19:48 UTC (rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/thunderstorm_background.hpp       
2009-11-06 00:28:22 UTC (rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HPP
-#define HEADER_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HPP
 
 #include "pingus/worldobj.hpp"
 #include "math/vector3f.hpp"

Modified: trunk/pingus/src/pingus/worldobjs/woodthing.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/woodthing.hpp     2009-11-06 00:19:48 UTC 
(rev 4049)
+++ trunk/pingus/src/pingus/worldobjs/woodthing.hpp     2009-11-06 00:28:22 UTC 
(rev 4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_WORLDOBJS_WOODTHING_HPP
-#define HEADER_PINGUS_WORLDOBJS_WOODTHING_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_WOODTHING_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJS_WOODTHING_HPP
 
 #include "pingus/worldobjs/entrance.hpp"
 

Modified: trunk/pingus/src/util/line_iterator.hpp
===================================================================
--- trunk/pingus/src/util/line_iterator.hpp     2009-11-06 00:19:48 UTC (rev 
4049)
+++ trunk/pingus/src/util/line_iterator.hpp     2009-11-06 00:28:22 UTC (rev 
4050)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_PINGUS_PINGUS_LINE_ITERATOR_HPP
-#define HEADER_PINGUS_PINGUS_LINE_ITERATOR_HPP
+#ifndef HEADER_PINGUS_UTIL_LINE_ITERATOR_HPP
+#define HEADER_PINGUS_UTIL_LINE_ITERATOR_HPP
 
 #include <string>