diff --git a/src/squirrel/exposed_object.hpp b/src/squirrel/exposed_object.hpp
index 58790c4e19c..2ea568171c6 100644
--- a/src/squirrel/exposed_object.hpp
+++ b/src/squirrel/exposed_object.hpp
@@ -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_SUPERTUX_SCRIPTING_EXPOSED_OBJECT_HPP
-#define HEADER_SUPERTUX_SCRIPTING_EXPOSED_OBJECT_HPP
+#ifndef HEADER_SUPERTUX_SQUIRREL_EXPOSED_OBJECT_HPP
+#define HEADER_SUPERTUX_SQUIRREL_EXPOSED_OBJECT_HPP
 
 #include <memory>
 
diff --git a/src/squirrel/script_engine.hpp b/src/squirrel/script_engine.hpp
index 61ee34083b3..9fd0193c06e 100644
--- a/src/squirrel/script_engine.hpp
+++ b/src/squirrel/script_engine.hpp
@@ -15,8 +15,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_SUPERTUX_SUPERTUX_SCRIPT_ENGINE_HPP
-#define HEADER_SUPERTUX_SUPERTUX_SCRIPT_ENGINE_HPP
+#ifndef HEADER_SUPERTUX_SQUIRREL_SCRIPT_ENGINE_HPP
+#define HEADER_SUPERTUX_SQUIRREL_SCRIPT_ENGINE_HPP
 
 #include <string>
 #include <vector>
diff --git a/src/squirrel/script_interface.hpp b/src/squirrel/script_interface.hpp
index 886085d09c3..9569e03a5ac 100644
--- a/src/squirrel/script_interface.hpp
+++ b/src/squirrel/script_interface.hpp
@@ -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_SUPERTUX_SUPERTUX_SCRIPT_INTERFACE_HPP
-#define HEADER_SUPERTUX_SUPERTUX_SCRIPT_INTERFACE_HPP
+#ifndef HEADER_SUPERTUX_SQUIRREL_SCRIPT_INTERFACE_HPP
+#define HEADER_SUPERTUX_SQUIRREL_SCRIPT_INTERFACE_HPP
 
 #include <squirrel.h>
 
diff --git a/src/squirrel/scripting.hpp b/src/squirrel/scripting.hpp
index 89b1e1e0ef2..52b91877859 100644
--- a/src/squirrel/scripting.hpp
+++ b/src/squirrel/scripting.hpp
@@ -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_SUPERTUX_SCRIPTING_SCRIPTING_HPP
-#define HEADER_SUPERTUX_SCRIPTING_SCRIPTING_HPP
+#ifndef HEADER_SUPERTUX_SQUIRREL_SCRIPTING_HPP
+#define HEADER_SUPERTUX_SQUIRREL_SCRIPTING_HPP
 
 #include <squirrel.h>
 
diff --git a/src/squirrel/serialize.hpp b/src/squirrel/serialize.hpp
index 67f875be6f6..bd47ccd2b2b 100644
--- a/src/squirrel/serialize.hpp
+++ b/src/squirrel/serialize.hpp
@@ -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_SUPERTUX_SCRIPTING_SERIALIZE_HPP
-#define HEADER_SUPERTUX_SCRIPTING_SERIALIZE_HPP
+#ifndef HEADER_SUPERTUX_SQUIRREL_SERIALIZE_HPP
+#define HEADER_SUPERTUX_SQUIRREL_SERIALIZE_HPP
 
 #include <squirrel.h>
 
diff --git a/src/squirrel/squirrel_error.hpp b/src/squirrel/squirrel_error.hpp
index 90dbb4b0266..c9910646eb7 100644
--- a/src/squirrel/squirrel_error.hpp
+++ b/src/squirrel/squirrel_error.hpp
@@ -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_SUPERTUX_SCRIPTING_SQUIRREL_ERROR_HPP
-#define HEADER_SUPERTUX_SCRIPTING_SQUIRREL_ERROR_HPP
+#ifndef HEADER_SUPERTUX_SQUIRREL_SQUIRREL_ERROR_HPP
+#define HEADER_SUPERTUX_SQUIRREL_SQUIRREL_ERROR_HPP
 
 #include <squirrel.h>
 #include <stdexcept>
diff --git a/src/squirrel/squirrel_util.hpp b/src/squirrel/squirrel_util.hpp
index 72eb7e09559..1bdc53b36e2 100644
--- a/src/squirrel/squirrel_util.hpp
+++ b/src/squirrel/squirrel_util.hpp
@@ -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_SUPERTUX_SCRIPTING_SQUIRREL_UTIL_HPP
-#define HEADER_SUPERTUX_SCRIPTING_SQUIRREL_UTIL_HPP
+#ifndef HEADER_SUPERTUX_SQUIRREL_SQUIRREL_UTIL_HPP
+#define HEADER_SUPERTUX_SQUIRREL_SQUIRREL_UTIL_HPP
 
 #include <assert.h>
 #include <limits>
diff --git a/src/squirrel/thread_queue.hpp b/src/squirrel/thread_queue.hpp
index 96026c46cd2..00c066def44 100644
--- a/src/squirrel/thread_queue.hpp
+++ b/src/squirrel/thread_queue.hpp
@@ -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_SUPERTUX_SCRIPTING_THREAD_QUEUE_HPP
-#define HEADER_SUPERTUX_SCRIPTING_THREAD_QUEUE_HPP
+#ifndef HEADER_SUPERTUX_SQUIRREL_THREAD_QUEUE_HPP
+#define HEADER_SUPERTUX_SQUIRREL_THREAD_QUEUE_HPP
 
 #include <squirrel.h>
 #include <vector>
diff --git a/src/squirrel/time_scheduler.hpp b/src/squirrel/time_scheduler.hpp
index d545db32599..0b790fe98c4 100644
--- a/src/squirrel/time_scheduler.hpp
+++ b/src/squirrel/time_scheduler.hpp
@@ -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_SUPERTUX_SCRIPTING_TIME_SCHEDULER_HPP
-#define HEADER_SUPERTUX_SCRIPTING_TIME_SCHEDULER_HPP
+#ifndef HEADER_SUPERTUX_SQUIRREL_TIME_SCHEDULER_HPP
+#define HEADER_SUPERTUX_SQUIRREL_TIME_SCHEDULER_HPP
 
 #include <vector>
 
diff --git a/src/util/dynamic_scoped_ref.hpp b/src/util/dynamic_scoped_ref.hpp
index a30858e10f7..f41bce7fba3 100644
--- a/src/util/dynamic_scoped_ref.hpp
+++ b/src/util/dynamic_scoped_ref.hpp
@@ -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_SUPERTUX_UTIL_DYNAMIC_SCOPED_HPP
-#define HEADER_SUPERTUX_UTIL_DYNAMIC_SCOPED_HPP
+#ifndef HEADER_SUPERTUX_UTIL_DYNAMIC_SCOPED_REF_HPP
+#define HEADER_SUPERTUX_UTIL_DYNAMIC_SCOPED_REF_HPP
 
 #include <assert.h>