From: Ryan Flegel <rflegel@gmail.com>
Date: Wed, 9 Jun 2004 05:23:20 +0000 (+0000)
Subject: - did some C++ifying. let's try to follow suit :)
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=308f11e38981077626fe0ea9887094f3c28b02f9;p=supertux.git

- did some C++ifying. let's try to follow suit :)

SVN-Revision: 1453
---

diff --git a/src/background.cpp b/src/background.cpp
index 1effc1671..ed51950f3 100644
--- a/src/background.cpp
+++ b/src/background.cpp
@@ -16,8 +16,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#include "background.h"
 
+#include "background.h"
 #include "globals.h"
 #include "camera.h"
 #include "screen/drawing_context.h"
diff --git a/src/background.h b/src/background.h
index a143bec74..91df5ae2a 100644
--- a/src/background.h
+++ b/src/background.h
@@ -16,8 +16,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __BACKGROUND_H__
-#define __BACKGROUND_H__
+
+#ifndef SUPERTUX_BACKGROUND_H
+#define SUPERTUX_BACKGROUND_H
 
 #include "screen/texture.h"
 #include "screen/drawing_context.h"
@@ -65,5 +66,5 @@ private:
   Color gradient_top, gradient_bottom;
 };
 
-#endif
+#endif /*SUPERTUX_BACKGROUND_H*/
 
diff --git a/src/badguy.cpp b/src/badguy.cpp
index 29d27dc4c..100ad815c 100644
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -21,7 +21,7 @@
 //  02111-1307, USA.
 
 #include <iostream>
-#include <math.h>
+#include <cmath>
 
 #include "globals.h"
 #include "defines.h"
diff --git a/src/badguy.h b/src/badguy.h
index c6b6eeca7..6b1566af4 100644
--- a/src/badguy.h
+++ b/src/badguy.h
@@ -24,6 +24,7 @@
 #define SUPERTUX_BADGUY_H
 
 #include "SDL.h"
+
 #include "timer.h"
 #include "screen/texture.h"
 #include "physic.h"
diff --git a/src/button.cpp b/src/button.cpp
index f144bb331..1cfbc72cf 100644
--- a/src/button.cpp
+++ b/src/button.cpp
@@ -18,8 +18,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
+
 #include "setup.h"
 #include "screen/screen.h"
 #include "screen/drawing_context.h"
diff --git a/src/button.h b/src/button.h
index 33db204d9..1290ff1e4 100644
--- a/src/button.h
+++ b/src/button.h
@@ -22,6 +22,7 @@
 #define SUPERTUX_BUTTON_H
 
 #include <vector>
+
 #include "screen/texture.h"
 #include "timer.h"
 
diff --git a/src/camera.cpp b/src/camera.cpp
index 6985fd7c9..b440d0e00 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -16,11 +16,12 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#include "camera.h"
 
 #include <stdexcept>
 #include <sstream>
-#include <math.h>
+#include <cmath>
+
+#include "camera.h"
 #include "lispwriter.h"
 #include "player.h"
 #include "tilemap.h"
diff --git a/src/camera.h b/src/camera.h
index 18d289414..9c6e6c514 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -16,14 +16,16 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __VIEWPORT_H__
-#define __VIEWPORT_H__
+
+#ifndef SUPERTUX_CAMERA_H
+#define SUPERTUX_CAMERA_H
 
 #include <vector>
+#include <cassert>
+
 #include "vector.h"
 #include "game_object.h"
 #include "serializable.h"
-#include <cassert>
 
 class LispReader;
 class Sector;
@@ -94,5 +96,5 @@ private:
   Vector current_dir;
 };
 
-#endif
+#endif /*SUPERTUX_CAMERA_H*/
 
diff --git a/src/configfile.cpp b/src/configfile.cpp
index 76f065cb8..501f9685e 100644
--- a/src/configfile.cpp
+++ b/src/configfile.cpp
@@ -17,8 +17,9 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <string>
+
 #include "configfile.h"
 #include "setup.h"
 #include "globals.h"
diff --git a/src/defines.h b/src/defines.h
index c191e33b6..8d9d8af22 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -19,9 +19,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#if !defined( SUPERTUX_DEFINES_H )
-
+#ifndef SUPERTUX_DEFINES_H
 #define SUPERTUX_DEFINES_H
+
 /* Version: */
 
 #ifndef VERSION
@@ -116,5 +116,5 @@ enum DyingType {
        #define DEBUG_MSG( msg ) {}
 #endif
 
-#endif
+#endif /*SUPERTUX_DEFINES_H*/
 
diff --git a/src/door.cpp b/src/door.cpp
index 89db33e33..39878876f 100644
--- a/src/door.cpp
+++ b/src/door.cpp
@@ -16,8 +16,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#include "door.h"
 
+#include "door.h"
 #include "lispreader.h"
 #include "lispwriter.h"
 #include "gameloop.h"
diff --git a/src/door.h b/src/door.h
index a0bae41c4..c66b8cd03 100644
--- a/src/door.h
+++ b/src/door.h
@@ -16,10 +16,12 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __DOOR_H__
-#define __DOOR_H__
+
+#ifndef SUPERTUX_DOOR_H
+#define SUPERTUX_DOOR_H
 
 #include <string>
+
 #include "interactive_object.h"
 #include "serializable.h"
 
@@ -45,5 +47,5 @@ private:
   std::string target_spawnpoint;
 };
 
-#endif
+#endif /*SUPERTUX_DOOR_H*/
 
diff --git a/src/game_object.cpp b/src/game_object.cpp
index c9d47bd22..1965d6a46 100644
--- a/src/game_object.cpp
+++ b/src/game_object.cpp
@@ -16,6 +16,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "game_object.h"
 
 GameObject::GameObject()
diff --git a/src/game_object.h b/src/game_object.h
index fe81d95af..8c6c3bfc4 100644
--- a/src/game_object.h
+++ b/src/game_object.h
@@ -16,8 +16,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __GAMEOBJECT_HPP__
-#define __GAMEOBJECT_HPP__
+
+#ifndef SUPERTUX_GAMEOBJECT_H
+#define SUPERTUX_GAMEOBJECT_H
 
 #include <string>
 
@@ -66,5 +67,5 @@ private:
   bool wants_to_die;
 };
 
-#endif
+#endif /*SUPERTUX_GAMEOBJECT_H*/
 
diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index fc09ba7c2..1652bef69 100644
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -20,16 +20,16 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <errno.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
+#include <cstring>
+#include <cerrno>
 #include <unistd.h>
-#include <math.h>
-#include <time.h>
-#include <SDL.h>
+#include <ctime>
+
+#include "SDL.h"
 
 #ifndef WIN32
 #include <sys/types.h>
diff --git a/src/gameobjs.cpp b/src/gameobjs.cpp
index 9075f2c73..3d9c20e68 100644
--- a/src/gameobjs.cpp
+++ b/src/gameobjs.cpp
@@ -18,9 +18,11 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
+
 #include <algorithm>
 #include <iostream>
-#include <math.h>
+#include <cmath>
+
 #include "tile.h"
 #include "gameloop.h"
 #include "gameobjs.h"
diff --git a/src/globals.h b/src/globals.h
index 5a68fc810..643bd1089 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -23,7 +23,9 @@
 #define SUPERTUX_GLOBALS_H
 
 #include <string>
-#include <SDL.h>
+
+#include "SDL.h"
+
 #include "screen/font.h"
 #include "menu.h"
 #include "mousecursor.h"
diff --git a/src/high_scores.cpp b/src/high_scores.cpp
index af4f754a6..db3cbfe11 100644
--- a/src/high_scores.cpp
+++ b/src/high_scores.cpp
@@ -20,8 +20,8 @@
 
 /* Open the highscore file: */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 
 #include "globals.h"
 #include "high_scores.h"
diff --git a/src/high_scores.h b/src/high_scores.h
index 1b5fe56b9..76d6739e2 100644
--- a/src/high_scores.h
+++ b/src/high_scores.h
@@ -21,7 +21,7 @@
 #ifndef SUPERTUX_HIGH_SCORES_H
 #define SUPERTUX_HIGH_SCORES_H
 
-#include <stdio.h>
+#include <cstdio>
 
 extern int hs_score;
 extern std::string hs_name; /* highscores global variables*/
diff --git a/src/interactive_object.cpp b/src/interactive_object.cpp
index 6c04dec20..ad8636c18 100644
--- a/src/interactive_object.cpp
+++ b/src/interactive_object.cpp
@@ -16,6 +16,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "interactive_object.h"
 
 InteractiveObject::InteractiveObject()
diff --git a/src/interactive_object.h b/src/interactive_object.h
index 891337437..bb06a5238 100644
--- a/src/interactive_object.h
+++ b/src/interactive_object.h
@@ -16,8 +16,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __INTERACTIVE_OBJECT_H__
-#define __INTERACTIVE_OBJECT_H__
+
+#ifndef SUPERTUX_INTERACTIVE_OBJECT_H
+#define SUPERTUX_INTERACTIVE_OBJECT_H
 
 #include "game_object.h"
 #include "type.h"
@@ -46,5 +47,5 @@ protected:
   base_type area;
 };
 
-#endif
+#endif /*SUPERTUX_INTERACTIVE_OBJECT_H*/
 
diff --git a/src/intro.cpp b/src/intro.cpp
index a0aa61895..587339e3a 100644
--- a/src/intro.cpp
+++ b/src/intro.cpp
@@ -16,6 +16,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "intro.h"
 #include "globals.h"
 #include "defines.h"
diff --git a/src/intro.h b/src/intro.h
index 8648e20b0..87b34e22f 100644
--- a/src/intro.h
+++ b/src/intro.h
@@ -17,8 +17,13 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#ifndef SUPERTUX_INTRO_H
+#define SUPERTUX_INTRO_H
+
 void draw_intro();
 
+#endif /*SUPERTUX_INTRO_H*/
+
 /* Local Variables: */
 /* mode:c++ */
 /* End: */
diff --git a/src/level.cpp b/src/level.cpp
index d74a30e2f..dbd3b30a1 100644
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -19,12 +19,13 @@
 //  02111-1307, USA.
 
 #include <map>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
+
 #include "globals.h"
 #include "setup.h"
 #include "camera.h"
diff --git a/src/level.h b/src/level.h
index 17272baf6..091d9b25d 100644
--- a/src/level.h
+++ b/src/level.h
@@ -23,6 +23,7 @@
 
 #include <map>
 #include <string>
+
 #include "screen/texture.h"
 #include "lispreader.h"
 #include "musicref.h"
diff --git a/src/leveleditor.cpp b/src/leveleditor.cpp
index d91363122..44a2345be 100644
--- a/src/leveleditor.cpp
+++ b/src/leveleditor.cpp
@@ -20,19 +20,19 @@
 
 #include <map>
 #include <typeinfo>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <errno.h>
-#include <unistd.h>
-#include <SDL.h>
-#include <SDL_image.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
+#include <cerrno>
 #include <algorithm>
 #include <iostream>
+#include <unistd.h>
 
-#include "leveleditor.h"
+#include "SDL.h"
+#include "SDL_image.h"
 
+#include "leveleditor.h"
 #include "screen/screen.h"
 #include "defines.h"
 #include "globals.h"
diff --git a/src/lispreader.cpp b/src/lispreader.cpp
index 51ff97c03..d9bcf4f2b 100644
--- a/src/lispreader.cpp
+++ b/src/lispreader.cpp
@@ -23,9 +23,10 @@
 
 #include <iostream>
 #include <string>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
+
 #include "setup.h"
 #include "lispreader.h"
 
diff --git a/src/lispreader.h b/src/lispreader.h
index 3c3ba737f..b90692514 100644
--- a/src/lispreader.h
+++ b/src/lispreader.h
@@ -21,14 +21,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __LISPREADER_H__
-#define __LISPREADER_H__
+#ifndef SUPERTUX_LISPREADER_H
+#define SUPERTUX_LISPREADER_H
 
-#include <stdio.h>
-#include <zlib.h>
+#include <cstdio>
 #include <string>
 #include <vector>
 #include <exception>
+
+#include <zlib.h>
+
 #include "exceptions.h"
 
 #define LISP_STREAM_FILE       1
@@ -198,5 +200,5 @@ public:
   lisp_object_t* get_lisp();
 };
 
-#endif
+#endif /*SUPERTUX_LISPREADER_H*/
 
diff --git a/src/lispwriter.cpp b/src/lispwriter.cpp
index 6438b2dfd..dbae3ccdb 100644
--- a/src/lispwriter.cpp
+++ b/src/lispwriter.cpp
@@ -16,9 +16,11 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#include "lispwriter.h"
+
 #include <iostream>
 
+#include "lispwriter.h"
+
 LispWriter::LispWriter(std::ostream& newout)
   : out(newout), indent_depth(0)
 {
diff --git a/src/lispwriter.h b/src/lispwriter.h
index 0277de028..50023e034 100644
--- a/src/lispwriter.h
+++ b/src/lispwriter.h
@@ -16,8 +16,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __LISPWRITER_H__
-#define __LISPWRITER_H__
+
+#ifndef SUPERTUX_LISPWRITER_H
+#define SUPERTUX_LISPWRITER_H
 
 #include <iostream>
 #include <vector>
diff --git a/src/menu.cpp b/src/menu.cpp
index 9932ed669..64384ac79 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -24,10 +24,10 @@
 
 #include <iostream>
 #include <sstream>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <string>
-#include <assert.h>
+#include <cassert>
 
 #include "defines.h"
 #include "globals.h"
diff --git a/src/menu.h b/src/menu.h
index 5fe4e4ac5..eb596dd2d 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -20,8 +20,10 @@
 #ifndef SUPERTUX_MENU_H
 #define SUPERTUX_MENU_H
 
-#include <SDL.h>
 #include <vector>
+
+#include "SDL.h"
+
 #include "screen/texture.h"
 #include "timer.h"
 #include "type.h"
diff --git a/src/mousecursor.cpp b/src/mousecursor.cpp
index d279ee2ec..ee0a57d01 100644
--- a/src/mousecursor.cpp
+++ b/src/mousecursor.cpp
@@ -16,6 +16,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "screen/drawing_context.h"
 #include "mousecursor.h"
 
diff --git a/src/mousecursor.h b/src/mousecursor.h
index a9b89bcdd..cd8697714 100644
--- a/src/mousecursor.h
+++ b/src/mousecursor.h
@@ -21,6 +21,7 @@
 #define SUPERTUX_MOUSECURSOR_H
 
 #include <string>
+
 #include "timer.h"
 #include "screen/texture.h"
 
diff --git a/src/moving_object.cpp b/src/moving_object.cpp
index b81d837de..1288dea74 100644
--- a/src/moving_object.cpp
+++ b/src/moving_object.cpp
@@ -16,6 +16,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "moving_object.h"
 
 MovingObject::MovingObject()
diff --git a/src/moving_object.h b/src/moving_object.h
index 988c75238..d9659a302 100644
--- a/src/moving_object.h
+++ b/src/moving_object.h
@@ -16,8 +16,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __MOVING_OBJECT_H__
-#define __MOVING_OBJECT_H__
+
+#ifndef SUPERTUX_MOVING_OBJECT_H
+#define SUPERTUX_MOVING_OBJECT_H
 
 #include "type.h"
 #include "game_object.h"
@@ -56,5 +57,5 @@ protected:
 #endif
 };
 
-#endif
+#endif /*SUPERTUX_MOVING_OBJECT_H*/
 
diff --git a/src/musicref.cpp b/src/musicref.cpp
index 55d0e6781..5850af6ed 100644
--- a/src/musicref.cpp
+++ b/src/musicref.cpp
@@ -17,6 +17,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "musicref.h"
 
 MusicRef::MusicRef()
diff --git a/src/musicref.h b/src/musicref.h
index 330601ba6..d80e4be30 100644
--- a/src/musicref.h
+++ b/src/musicref.h
@@ -16,8 +16,9 @@
 //  You should have received a copy of the GNU General Public License
 //  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_MUSIC_RESOURCE_H
-#define HEADER_MUSIC_RESOURCE_H
+
+#ifndef SUPERTUX_MUSICREF_H
+#define SUPERTUX_MUSICREF_H
 
 #include "sound_manager.h"
 
@@ -40,5 +41,5 @@ private:
   SoundManager::MusicResource* music;
 };
 
-#endif
+#endif /*SUPERTUX_MUSICREF_H*/
 
diff --git a/src/particlesystem.cpp b/src/particlesystem.cpp
index c21d109b9..5ac67e920 100644
--- a/src/particlesystem.cpp
+++ b/src/particlesystem.cpp
@@ -17,10 +17,11 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "particlesystem.h"
 
 #include <iostream>
-#include <math.h>
+#include <cmath>
+
+#include "particlesystem.h"
 #include "globals.h"
 #include "lispreader.h"
 #include "lispwriter.h"
diff --git a/src/particlesystem.h b/src/particlesystem.h
index e2a7f1ab5..e27930e31 100644
--- a/src/particlesystem.h
+++ b/src/particlesystem.h
@@ -21,6 +21,7 @@
 #define SUPERTUX_PARTICLESYSTEM_H
 
 #include <vector>
+
 #include "screen/texture.h"
 #include "game_object.h"
 #include "serializable.h"
diff --git a/src/physic.cpp b/src/physic.cpp
index 7300b9e3c..55b491ac6 100644
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "scene.h"
 #include "defines.h"
diff --git a/src/player.cpp b/src/player.cpp
index f326f0876..806ca89e8 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -17,9 +17,10 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <math.h>
+#include <cmath>
 #include <iostream>
 #include <cassert>
+
 #include "gameloop.h"
 #include "globals.h"
 #include "player.h"
diff --git a/src/player.h b/src/player.h
index dbf43bbb5..dedc6b19c 100644
--- a/src/player.h
+++ b/src/player.h
@@ -20,7 +20,8 @@
 #ifndef SUPERTUX_PLAYER_H
 #define SUPERTUX_PLAYER_H
 
-#include <SDL.h>
+#include "SDL.h"
+
 #include "bitmask.h"
 #include "type.h"
 #include "timer.h"
diff --git a/src/scene.cpp b/src/scene.cpp
index 405ea8944..238039e90 100644
--- a/src/scene.cpp
+++ b/src/scene.cpp
@@ -17,7 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <stdlib.h>
+#include <cstdlib>
+
 #include "scene.h"
 #include "defines.h"
 
diff --git a/src/sector.cpp b/src/sector.cpp
index b815ba21e..252cafbc7 100644
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -16,15 +16,15 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#include "sector.h"
 
 #include <memory>
 #include <stdexcept>
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
-#include "lispreader.h"
 
+#include "sector.h"
+#include "lispreader.h"
 #include "badguy.h"
 #include "special.h"
 #include "gameobjs.h"
diff --git a/src/sector.h b/src/sector.h
index 96a2e45c9..4db528543 100644
--- a/src/sector.h
+++ b/src/sector.h
@@ -16,11 +16,13 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __SECTOR_H__
-#define __SECTOR_H__
+
+#ifndef SUPERTUX_SECTOR_H
+#define SUPERTUX_SECTOR_H
 
 #include <string>
 #include <vector>
+
 #include "vector.h"
 #include "badguy.h"
 #include "special.h"
diff --git a/src/serializable.h b/src/serializable.h
index c95397769..9f1f69bfe 100644
--- a/src/serializable.h
+++ b/src/serializable.h
@@ -16,8 +16,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __SERIALIZABLE_H__
-#define __SERIALIZABLE_H__
+
+#ifndef SUPERTUX_SERIALIZABLE_H
+#define SUPERTUX_SERIALIZABLE_H
 
 class LispWriter;
 
@@ -27,5 +28,5 @@ public:
   virtual void write(LispWriter& writer) = 0;
 };
 
-#endif
+#endif /*SUPERTUX_SERIALIZABLE_H*/
 
diff --git a/src/setup.cpp b/src/setup.cpp
index 8ab5c039c..7654c3fc0 100644
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -17,18 +17,19 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <assert.h>
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
 #include <unistd.h>
-#include <SDL.h>
-#include <SDL_image.h>
+
+#include "SDL.h"
+#include "SDL_image.h"
 #ifndef NOOPENGL
-#include <SDL_opengl.h>
+#include "SDL_opengl.h"
 #endif
 
 #include <sys/stat.h>
@@ -37,7 +38,8 @@
 #ifndef WIN32
 #include <libgen.h>
 #endif
-#include <ctype.h>
+
+#include <cctype>
 
 #include "defines.h"
 #include "globals.h"
diff --git a/src/sound.cpp b/src/sound.cpp
index 83c8bbb42..85d4d377c 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -17,6 +17,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "defines.h"
 #include "globals.h"
 #include "sound.h"
diff --git a/src/sound_manager.cpp b/src/sound_manager.cpp
index c95902e17..6a35dd5c5 100644
--- a/src/sound_manager.cpp
+++ b/src/sound_manager.cpp
@@ -16,10 +16,11 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#include "sound_manager.h"
 
-#include <math.h>
-#include <assert.h>
+#include <cmath>
+#include <cassert>
+
+#include "sound_manager.h"
 #include "musicref.h"
 #include "setup.h"
 #include "sector.h"
diff --git a/src/sound_manager.h b/src/sound_manager.h
index d34082a73..e3087207c 100644
--- a/src/sound_manager.h
+++ b/src/sound_manager.h
@@ -16,14 +16,17 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __SOUND_MANAGER_H__
-#define __SOUND_MANAGER_H__
 
-#include "vector.h"
-#include <SDL_mixer.h>
+#ifndef SUPERTUX_SOUND_MANAGER_H
+#define SUPERTUX_SOUND_MANAGER_H
+
 #include <string>
 #include <map>
 
+#include "SDL_mixer.h"
+
+#include "vector.h"
+
 class MusicRef;
 class MovingObject;
 
@@ -67,5 +70,5 @@ private:
   bool music_enabled;
 };
 
-#endif
+#endif /*SUPERTUX_SOUND_MANAGER_H*/
 
diff --git a/src/special.cpp b/src/special.cpp
index 594bce309..8d67cbd8b 100644
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -17,9 +17,11 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <assert.h>
+#include <cassert>
 #include <iostream>
+
 #include "SDL.h"
+
 #include "defines.h"
 #include "special.h"
 #include "camera.h"
diff --git a/src/special.h b/src/special.h
index 550e2a424..e4b09c531 100644
--- a/src/special.h
+++ b/src/special.h
@@ -20,7 +20,8 @@
 #ifndef SUPERTUX_SPECIAL_H
 #define SUPERTUX_SPECIAL_H
 
-#include <SDL.h>
+#include "SDL.h"
+
 #include "bitmask.h"
 #include "type.h"
 #include "screen/texture.h"
diff --git a/src/sprite.cpp b/src/sprite.cpp
index c6f2ea20a..8386b4cb5 100644
--- a/src/sprite.cpp
+++ b/src/sprite.cpp
@@ -18,7 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <math.h>
+#include <cmath>
+
 #include "globals.h"
 #include "sprite.h"
 #include "setup.h"
diff --git a/src/sprite.h b/src/sprite.h
index 80264421d..61a6d9523 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -17,11 +17,12 @@
 //  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_SPRITE_HXX
-#define HEADER_SPRITE_HXX
+#ifndef SUPERTUX_SPRITE_H
+#define SUPERTUX_SPRITE_H
 
 #include <string>
 #include <vector>
+
 #include "lispreader.h"
 #include "screen/texture.h"
 #include "vector.h"
@@ -68,7 +69,7 @@ class Sprite
   int get_height() const;
 };
 
-#endif
+#endif /*SUPERTUX_SPRITE_H*/
 
 /* Local Variables: */
 /* mode:c++ */
diff --git a/src/sprite_manager.cpp b/src/sprite_manager.cpp
index e2343a865..845bccb81 100644
--- a/src/sprite_manager.cpp
+++ b/src/sprite_manager.cpp
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
+
 #include "lispreader.h"
 #include "sprite_manager.h"
 
diff --git a/src/sprite_manager.h b/src/sprite_manager.h
index 1822caecb..a829f6755 100644
--- a/src/sprite_manager.h
+++ b/src/sprite_manager.h
@@ -17,10 +17,11 @@
 //  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_SPRITE_MANAGER_HXX
-#define HEADER_SPRITE_MANAGER_HXX
+#ifndef SUPERTUX_SPRITE_MANAGER_H
+#define SUPERTUX_SPRITE_MANAGER_H
 
 #include <map>
+
 #include "sprite.h"
 
 class SpriteManager
@@ -39,7 +40,7 @@ class SpriteManager
   Sprite* load(const std::string& name);
 };
 
-#endif
+#endif /*SUPERTUX_SPRITE_MANAGER_H*/
 
 /* Local Variables: */
 /* mode:c++ */
diff --git a/src/supertux.cpp b/src/supertux.cpp
index c9e22aa84..cf5b0424a 100644
--- a/src/supertux.cpp
+++ b/src/supertux.cpp
@@ -19,12 +19,11 @@
 //  02111-1307, USA.
 
 #include <sys/types.h>
-#include <ctype.h>
+#include <cctype>
 #include <iostream>
-
 #include <exception>
-#include "exceptions.h"
 
+#include "exceptions.h"
 #include "defines.h"
 #include "globals.h"
 #include "setup.h"
diff --git a/src/tile.cpp b/src/tile.cpp
index 0955b6168..bdd06bb68 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -18,10 +18,11 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
+#include <cassert>
+#include <iostream>
+
 #include "tile.h"
 #include "scene.h"
-#include <assert.h>
-#include <iostream>
 #include "screen/drawing_context.h"
 
 TileManager* TileManager::instance_  = 0;
diff --git a/src/tile.h b/src/tile.h
index 390d52940..978ed3a52 100644
--- a/src/tile.h
+++ b/src/tile.h
@@ -24,6 +24,7 @@
 #include <set>
 #include <map>
 #include <vector>
+
 #include "screen/texture.h"
 #include "globals.h"
 #include "lispreader.h"
diff --git a/src/tilemap.cpp b/src/tilemap.cpp
index 5eb102024..3ed4fa9ef 100644
--- a/src/tilemap.cpp
+++ b/src/tilemap.cpp
@@ -16,13 +16,14 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#include "tilemap.h"
 
-#include <assert.h>
+#include <cassert>
 #include <algorithm>
 #include <iostream>
 #include <stdexcept>
-#include <math.h>
+#include <cmath>
+
+#include "tilemap.h"
 #include "screen/drawing_context.h"
 #include "level.h"
 #include "tile.h"
diff --git a/src/tilemap.h b/src/tilemap.h
index b629ccd64..18340aae8 100644
--- a/src/tilemap.h
+++ b/src/tilemap.h
@@ -16,10 +16,12 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __TILEMAP_H__
-#define __TILEMAP_H__
+
+#ifndef SUPERTUX_TILEMAP_H
+#define SUPERTUX_TILEMAP_H
 
 #include <vector>
+
 #include "game_object.h"
 #include "serializable.h"
 #include "vector.h"
@@ -83,5 +85,5 @@ private:
   int layer;
 };
 
-#endif
+#endif /*SUPERTUX_TILEMAP_H*/
 
diff --git a/src/timer.cpp b/src/timer.cpp
index 1fd716d82..f316fa577 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -19,6 +19,7 @@
 //  02111-1307, USA.
 
 #include "SDL.h"
+
 #include "defines.h"
 #include "timer.h"
 
diff --git a/src/type.cpp b/src/type.cpp
index 9b4438560..2581e79ee 100644
--- a/src/type.cpp
+++ b/src/type.cpp
@@ -19,6 +19,7 @@
 //  02111-1307, USA.
 
 #include "SDL_image.h"
+
 #include "string.h"
 #include "stdlib.h"
 #include "setup.h"
diff --git a/src/type.h b/src/type.h
index 34b320633..70b3ff74d 100644
--- a/src/type.h
+++ b/src/type.h
@@ -22,7 +22,9 @@
 #define SUPERTUX_TYPE_H
 
 #include <string>
+
 #include "SDL.h"
+
 #include "scene.h"
 
 /* 'Base' type for game objects */
diff --git a/src/vector.cpp b/src/vector.cpp
index b2cb13a59..e20351ade 100644
--- a/src/vector.cpp
+++ b/src/vector.cpp
@@ -16,8 +16,10 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include <cmath>
+
 #include "vector.h"
-#include <math.h>
 
 Vector Vector::unit() const
 {
diff --git a/src/vector.h b/src/vector.h
index e45a33772..b93345445 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -16,8 +16,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __VECTOR_HPP__
-#define __VECTOR_HPP__
+
+#ifndef SUPERTUX_VECTOR_H
+#define SUPERTUX_VECTOR_H
 
 class Vector
 {
@@ -91,5 +92,5 @@ public:
               // for such simple stuff :)
 };
 
-#endif
+#endif /*SUPERTUX_VECTOR_H*/
 
diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 93090a9fc..373dec213 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -20,8 +20,9 @@
 #include <iostream>
 #include <fstream>
 #include <vector>
-#include <assert.h>
+#include <cassert>
 #include <unistd.h>
+
 #include "globals.h"
 #include "screen/texture.h"
 #include "screen/screen.h"