diff --git a/src/audio/music.hpp b/src/audio/music.hpp
index 04bf80358..936e40890 100644
--- a/src/audio/music.hpp
+++ b/src/audio/music.hpp
@@ -38,5 +38,5 @@ public:
     virtual     ~Music       () {};
 };
 
-#endif // HEADER_MUSIC_H
+#endif // HEADER_MUSIC_HPP
 
diff --git a/src/audio/music_ogg.hpp b/src/audio/music_ogg.hpp
index a20e85337..04541db4c 100644
--- a/src/audio/music_ogg.hpp
+++ b/src/audio/music_ogg.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_MUSICOGG_H
-#define HEADER_MUSICOGG_H
+#ifndef HEADER_MUSICOGG_HPP
+#define HEADER_MUSICOGG_HPP
 
 #include <string>
 #include <iostream>
@@ -81,4 +81,4 @@ private:
     static const int m_buffer_size = 11025*4;//one full second of audio at 44100 samples per second
 };
 
-#endif // HEADER_MUSICOGG_H
+#endif // HEADER_MUSICOGG_HPP
diff --git a/src/audio/sound_manager.hpp b/src/audio/sound_manager.hpp
index bd0c1020c..da0e667a8 100644
--- a/src/audio/sound_manager.hpp
+++ b/src/audio/sound_manager.hpp
@@ -18,8 +18,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_SOUNDMANAGER_H
-#define HEADER_SOUNDMANAGER_H
+#ifndef HEADER_SOUNDMANAGER_HPP
+#define HEADER_SOUNDMANAGER_HPP
 
 #include <map>
 #include <vector>
@@ -76,5 +76,5 @@ public:
 
 extern SoundManager* sound_manager;
 
-#endif // HEADER_SOUNDMANAGER_H
+#endif // HEADER_SOUNDMANAGER_HPP
 
diff --git a/src/challenges/unlock_manager.hpp b/src/challenges/unlock_manager.hpp
index 1fbd6b37b..69ddd2250 100644
--- a/src/challenges/unlock_manager.hpp
+++ b/src/challenges/unlock_manager.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_UNLOCK_MANAGER_H
-#define HEADER_UNLOCK_MANAGER_H
+#ifndef HEADER_UNLOCK_MANAGER_HPP
+#define HEADER_UNLOCK_MANAGER_HPP
 
 #include <map>
 
diff --git a/src/gui/font.hpp b/src/gui/font.hpp
index 6dd8865e7..2e14ee853 100644
--- a/src/gui/font.hpp
+++ b/src/gui/font.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_FONT_H
-#define HEADER_FONT_H
+#ifndef HEADER_FONT_HPP
+#define HEADER_FONT_HPP
 
 #include <string>
 
diff --git a/src/input/input_manager.hpp b/src/input/input_manager.hpp
index 2fefdf6ce..635fc5302 100644
--- a/src/input/input_manager.hpp
+++ b/src/input/input_manager.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_INPUT_MANAGER_H
-#define HEADER_INPUT_MANAGER_H
+#ifndef HEADER_INPUT_MANAGER_HPP
+#define HEADER_INPUT_MANAGER_HPP
 
 #include <string>
 #include <vector>
diff --git a/src/items/attachment.hpp b/src/items/attachment.hpp
index a36519fdb..62ef94534 100644
--- a/src/items/attachment.hpp
+++ b/src/items/attachment.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_ATTACHMENT_H
-#define HEADER_ATTACHMENT_H
+#ifndef HEADER_ATTACHMENT_HPP
+#define HEADER_ATTACHMENT_HPP
 
 #include "stk_config.hpp"
 #include "utils/random_generator.hpp"
diff --git a/src/items/item_manager.hpp b/src/items/item_manager.hpp
index 2d386d262..9d04e82bb 100644
--- a/src/items/item_manager.hpp
+++ b/src/items/item_manager.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_ITEMMANAGER_H
-#define HEADER_ITEMMANAGER_H
+#ifndef HEADER_ITEMMANAGER_HPP
+#define HEADER_ITEMMANAGER_HPP
 
 
 #include <vector>
diff --git a/src/items/powerup.hpp b/src/items/powerup.hpp
index ebd7b899c..86bdcf9c3 100644
--- a/src/items/powerup.hpp
+++ b/src/items/powerup.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_POWERUP_H
-#define HEADER_POWERUP_H
+#ifndef HEADER_POWERUP_HPP
+#define HEADER_POWERUP_HPP
 
 #define MAX_POWERUPS 5
 
diff --git a/src/karts/auto_kart.hpp b/src/karts/auto_kart.hpp
index 733fcbc1c..ceb02e737 100644
--- a/src/karts/auto_kart.hpp
+++ b/src/karts/auto_kart.hpp
@@ -18,8 +18,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_AUTOKART_H
-#define HEADER_AUTOKART_H
+#ifndef HEADER_AUTOKART_HPP
+#define HEADER_AUTOKART_HPP
 
 #include "karts/kart.hpp"
 #include "karts/kart_properties.hpp"
diff --git a/src/karts/kart_properties_manager.hpp b/src/karts/kart_properties_manager.hpp
index 5d4083b7e..207e640f7 100644
--- a/src/karts/kart_properties_manager.hpp
+++ b/src/karts/kart_properties_manager.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_KARTPROPERTIESMANAGER_H
-#define HEADER_KARTPROPERTIESMANAGER_H
+#ifndef HEADER_KARTPROPERTIESMANAGER_HPP
+#define HEADER_KARTPROPERTIESMANAGER_HPP
 
 #include <vector>
 #include <map>
diff --git a/src/karts/player_kart.hpp b/src/karts/player_kart.hpp
index 0428378e7..643f5f501 100644
--- a/src/karts/player_kart.hpp
+++ b/src/karts/player_kart.hpp
@@ -19,8 +19,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-#ifndef HEADER_PLAYERKART_H
-#define HEADER_PLAYERKART_H
+#ifndef HEADER_PLAYERKART_HPP
+#define HEADER_PLAYERKART_HPP
 
 #include "player.hpp"
 #include "karts/kart.hpp"
diff --git a/src/network/character_info_message.hpp b/src/network/character_info_message.hpp
index e42cf6f8d..1d78cae23 100644
--- a/src/network/character_info_message.hpp
+++ b/src/network/character_info_message.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_CHARACTER_INFO_MESSAGE_H
-#define HEADER_CHARACTER_INFO_MESSAGE_H
+#ifndef HEADER_CHARACTER_INFO_MESSAGE_HPP
+#define HEADER_CHARACTER_INFO_MESSAGE_HPP
 
 #include "karts/kart_properties_manager.hpp"
 #include "network/message.hpp"
diff --git a/src/network/character_selected_message.hpp b/src/network/character_selected_message.hpp
index 14c694900..a785efcf6 100644
--- a/src/network/character_selected_message.hpp
+++ b/src/network/character_selected_message.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_CHARACTER_SELECTED_MESSAGE_H
-#define HEADER_CHARACTER_SELECTED_MESSAGE_H
+#ifndef HEADER_CHARACTER_SELECTED_MESSAGE_HPP
+#define HEADER_CHARACTER_SELECTED_MESSAGE_HPP
 
 #include "network/message.hpp"
 #include "network/remote_kart_info.hpp"
diff --git a/src/network/connect_message.hpp b/src/network/connect_message.hpp
index e57e7e357..f45f303d7 100644
--- a/src/network/connect_message.hpp
+++ b/src/network/connect_message.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_CONNECT_MESSAGE_H
-#define HEADER_CONNECT_MESSAGE_H
+#ifndef HEADER_CONNECT_MESSAGE_HPP
+#define HEADER_CONNECT_MESSAGE_HPP
 
 #include <string>
 
diff --git a/src/network/kart_control_message.hpp b/src/network/kart_control_message.hpp
index 965ca4c5a..ff286d877 100644
--- a/src/network/kart_control_message.hpp
+++ b/src/network/kart_control_message.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_KART_CONTROL_MESSAGE_H
-#define HEADER_KART_CONTROL_MESSAGE_H
+#ifndef HEADER_KART_CONTROL_MESSAGE_HPP
+#define HEADER_KART_CONTROL_MESSAGE_HPP
 
 #include "network/message.hpp"
 
diff --git a/src/network/kart_update_message.hpp b/src/network/kart_update_message.hpp
index 0901ed53e..6d3b60323 100644
--- a/src/network/kart_update_message.hpp
+++ b/src/network/kart_update_message.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_KART_UPDATE_MESSAGE_H
-#define HEADER_KART_UPDATE_MESSAGE_H
+#ifndef HEADER_KART_UPDATE_MESSAGE_HPP
+#define HEADER_KART_UPDATE_MESSAGE_HPP
 
 #include "network/message.hpp"
 
diff --git a/src/network/network_kart.hpp b/src/network/network_kart.hpp
index e2d270c4b..48f722e87 100644
--- a/src/network/network_kart.hpp
+++ b/src/network/network_kart.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_NETWORK_KART_H
-#define HEADER_NETWORK_KART_H
+#ifndef HEADER_NETWORK_KART_HPP
+#define HEADER_NETWORK_KART_HPP
 
 #include "karts/kart.hpp"
 
diff --git a/src/network/network_manager.hpp b/src/network/network_manager.hpp
index 201b66123..5769ad540 100644
--- a/src/network/network_manager.hpp
+++ b/src/network/network_manager.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_NETWORK_MANAGER_H
-#define HEADER_NETWORK_MANAGER_H
+#ifndef HEADER_NETWORK_MANAGER_HPP
+#define HEADER_NETWORK_MANAGER_HPP
 
 #include <string>
 #include <vector>
diff --git a/src/network/num_players_message.hpp b/src/network/num_players_message.hpp
index fb4d14661..f777bcfc8 100644
--- a/src/network/num_players_message.hpp
+++ b/src/network/num_players_message.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_NUM_PLAYERS_MESSAGE_H
-#define HEADER_NUM_PLAYERS_MESSAGE_H
+#ifndef HEADER_NUM_PLAYERS_MESSAGE_HPP
+#define HEADER_NUM_PLAYERS_MESSAGE_HPP
 
 #include <string>
 #include <sstream>
diff --git a/src/network/remote_kart_info.hpp b/src/network/remote_kart_info.hpp
index 19b020bea..837715c75 100644
--- a/src/network/remote_kart_info.hpp
+++ b/src/network/remote_kart_info.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_REMOTE_KART_INFO_H
-#define HEADER_REMOTE_KART_INFO_H
+#ifndef HEADER_REMOTE_KART_INFO_HPP
+#define HEADER_REMOTE_KART_INFO_HPP
 
 #include <string>
 
diff --git a/src/network/world_loaded_message.hpp b/src/network/world_loaded_message.hpp
index d439502cb..4833b3c99 100644
--- a/src/network/world_loaded_message.hpp
+++ b/src/network/world_loaded_message.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_WORLD_LOADED_H
-#define HEADER_WORLD_LOADED_H
+#ifndef HEADER_WORLD_LOADED_HPP
+#define HEADER_WORLD_LOADED_HPP
 
 #include "network/message.hpp"
 
diff --git a/src/race/grand_prix_data.hpp b/src/race/grand_prix_data.hpp
index d95141e8f..e00a9fdba 100644
--- a/src/race/grand_prix_data.hpp
+++ b/src/race/grand_prix_data.hpp
@@ -18,8 +18,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_GRAND_PRIX_DATA_H
-#define HEADER_GRAND_PRIX_DATA_H
+#ifndef HEADER_GRAND_PRIX_DATA_HPP
+#define HEADER_GRAND_PRIX_DATA_HPP
 
 #include <string>
 #include <vector>
diff --git a/src/race/grand_prix_manager.hpp b/src/race/grand_prix_manager.hpp
index 29778adc6..35cdd1922 100644
--- a/src/race/grand_prix_manager.hpp
+++ b/src/race/grand_prix_manager.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_GRAND_PRIX_MANAGER_H
-#define HEADER_GRAND_PRIX_MANAGER_H
+#ifndef HEADER_GRAND_PRIX_MANAGER_HPP
+#define HEADER_GRAND_PRIX_MANAGER_HPP
 
 #include <vector>
 #include <string>
diff --git a/src/replay/replay_base.hpp b/src/replay/replay_base.hpp
index cc5cd01dc..95c2277ee 100644
--- a/src/replay/replay_base.hpp
+++ b/src/replay/replay_base.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_REPLAYBASE_H
-#define HEADER_REPLAYBASE_H
+#ifndef HEADER_REPLAYBASE_HPP
+#define HEADER_REPLAYBASE_HPP
 
 #ifdef HAVE_GHOST_REPLAY
 
@@ -72,5 +72,5 @@ protected:
 
 #endif // HAVE_GHOST_REPLAY
 
-#endif // HEADER_REPLAYBASE_H
+#endif // HEADER_REPLAYBASE_HPP
 
diff --git a/src/replay/replay_buffer_tpl.hpp b/src/replay/replay_buffer_tpl.hpp
index dd7bdcc1f..1804a236f 100644
--- a/src/replay/replay_buffer_tpl.hpp
+++ b/src/replay/replay_buffer_tpl.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_REPLAYBUFFERTPL_H
-#define HEADER_REPLAYBUFFERTPL_H
+#ifndef HEADER_REPLAYBUFFERTPL_HPP
+#define HEADER_REPLAYBUFFERTPL_HPP
 
 #ifdef HAVE_GHOST_REPLAY
 
@@ -304,5 +304,5 @@ T* ReplayBufferArray<T>::getNewArray()
 
 #endif // HAVE_GHOST_REPLAY
 
-#endif // HEADER_REPLAYBUFFERTPL_H
+#endif // HEADER_REPLAYBUFFERTPL_HPP
 
diff --git a/src/replay/replay_buffers.hpp b/src/replay/replay_buffers.hpp
index 8fedc0bfd..fdc162de8 100644
--- a/src/replay/replay_buffers.hpp
+++ b/src/replay/replay_buffers.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_REPLAYBUFFERS_H
-#define HEADER_REPLAYBUFFERS_H
+#ifndef HEADER_REPLAYBUFFERS_HPP
+#define HEADER_REPLAYBUFFERS_HPP
 
 #ifdef HAVE_GHOST_REPLAY
 
@@ -74,5 +74,5 @@ private:
 
 #endif // HAVE_GHOST_REPLAY
 
-#endif // HEADER_REPLAYBUFFERS_H
+#endif // HEADER_REPLAYBUFFERS_HPP
 
diff --git a/src/replay/replay_player.hpp b/src/replay/replay_player.hpp
index f08e69e39..c264f20b1 100644
--- a/src/replay/replay_player.hpp
+++ b/src/replay/replay_player.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_REPLAYPLAYER_H
-#define HEADER_REPLAYPLAYER_H
+#ifndef HEADER_REPLAYPLAYER_HPP
+#define HEADER_REPLAYPLAYER_HPP
 
 #ifdef HAVE_GHOST_REPLAY
 
@@ -83,5 +83,5 @@ private:
 
 #endif // HAVE_GHOST_REPLAY
 
-#endif // HEADER_REPLAYPLAYER_H
+#endif // HEADER_REPLAYPLAYER_HPP
 
diff --git a/src/replay/replay_recorder.hpp b/src/replay/replay_recorder.hpp
index 8081466a7..799de6f7e 100644
--- a/src/replay/replay_recorder.hpp
+++ b/src/replay/replay_recorder.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_REPLAYRECORDER_H
-#define HEADER_REPLAYRECORDER_H
+#ifndef HEADER_REPLAYRECORDER_HPP
+#define HEADER_REPLAYRECORDER_HPP
 
 #ifdef HAVE_GHOST_REPLAY
 
@@ -59,5 +59,5 @@ private:
 
 #endif // HAVE_GHOST_REPLAY
 
-#endif // HEADER_REPLAYRECORDER_H
+#endif // HEADER_REPLAYRECORDER_HPP
 
diff --git a/src/robots/default_robot.hpp b/src/robots/default_robot.hpp
index f17289a06..a42a539c6 100644
--- a/src/robots/default_robot.hpp
+++ b/src/robots/default_robot.hpp
@@ -16,8 +16,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_DEFAULT_H
-#define HEADER_DEFAULT_H
+#ifndef HEADER_DEFAULT_HPP
+#define HEADER_DEFAULT_HPP
 
 #include "karts/auto_kart.hpp"
 #include "utils/vec3.hpp"
diff --git a/src/robots/empty_robot.hpp b/src/robots/empty_robot.hpp
index d06d7819e..953a8286d 100644
--- a/src/robots/empty_robot.hpp
+++ b/src/robots/empty_robot.hpp
@@ -17,8 +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.
 
-#ifndef HEADER_EMPTY_H
-#define HEADER_EMPTY_H
+#ifndef HEADER_EMPTY_HPP
+#define HEADER_EMPTY_HPP
 
 #include "auto_kart.hpp"
 
diff --git a/src/utils/coord.hpp b/src/utils/coord.hpp
index 37b1e9b98..4bf989b6d 100644
--- a/src/utils/coord.hpp
+++ b/src/utils/coord.hpp
@@ -18,8 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-#ifndef HEADER_COORD_H
-#define HEADER_COORD_H
+#ifndef HEADER_COORD_HPP
+#define HEADER_COORD_HPP
 
 #include "LinearMath/btTransform.h"