8 files changed, 24 insertions, 24 deletions
diff --git a/src/listeners/actionlistener.h b/src/listeners/actionlistener.h
index b22e5abc6..895cc985d 100644
--- a/src/listeners/actionlistener.h
+++ b/src/listeners/actionlistener.h
@@ -61,8 +61,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LISTENERS_ACTIONLISTENER_HPP
-#define LISTENERS_ACTIONLISTENER_HPP
+#ifndef LISTENERS_ACTIONLISTENER_H
+#define LISTENERS_ACTIONLISTENER_H
 
 #include <string>
 
@@ -106,4 +106,4 @@ class ActionListener
         { }
 };
 
-#endif  // end LISTENERS_ACTIONLISTENER_HPP
+#endif  // LISTENERS_ACTIONLISTENER_H
diff --git a/src/listeners/deathlistener.h b/src/listeners/deathlistener.h
index beefe1746..ddd7db910 100644
--- a/src/listeners/deathlistener.h
+++ b/src/listeners/deathlistener.h
@@ -61,8 +61,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LISTENERS_DEATHLISTENER_HPP
-#define LISTENERS_DEATHLISTENER_HPP
+#ifndef LISTENERS_DEATHLISTENER_H
+#define LISTENERS_DEATHLISTENER_H
 
 #include <string>
 
@@ -103,4 +103,4 @@ class DeathListener
         { }
 };
 
-#endif  // LISTENERS_DEATHLISTENER_HPP
+#endif  // LISTENERS_DEATHLISTENER_H
diff --git a/src/listeners/focuslistener.h b/src/listeners/focuslistener.h
index c910f833e..10e4a2af0 100644
--- a/src/listeners/focuslistener.h
+++ b/src/listeners/focuslistener.h
@@ -61,8 +61,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LISTENERS_FOCUSLISTENER_HPP
-#define LISTENERS_FOCUSLISTENER_HPP
+#ifndef LISTENERS_FOCUSLISTENER_H
+#define LISTENERS_FOCUSLISTENER_H
 
 #include <string>
 
@@ -113,4 +113,4 @@ class FocusListener
         { }
 };
 
-#endif  // LISTENERS_FOCUSLISTENER_HPP
+#endif  // LISTENERS_FOCUSLISTENER_H
diff --git a/src/listeners/keylistener.h b/src/listeners/keylistener.h
index 0873de835..efc387300 100644
--- a/src/listeners/keylistener.h
+++ b/src/listeners/keylistener.h
@@ -61,8 +61,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_KEYLISTENER_HPP
-#define GCN_KEYLISTENER_HPP
+#ifndef LISTENERS_KEYLISTENER_H
+#define LISTENERS_KEYLISTENER_H
 
 #include "events/keyevent.h"
 
@@ -113,4 +113,4 @@ class KeyListener
         { }
 };
 
-#endif  // end GCN_KEYLISTENER_HPP
+#endif  // LISTENERS_KEYLISTENER_H
diff --git a/src/listeners/mouselistener.h b/src/listeners/mouselistener.h
index d294e4dd6..9a2a4ef04 100644
--- a/src/listeners/mouselistener.h
+++ b/src/listeners/mouselistener.h
@@ -61,8 +61,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_MOUSELISTENER_HPP
-#define GCN_MOUSELISTENER_HPP
+#ifndef LISTENERS_MOUSELISTENER_H
+#define LISTENERS_MOUSELISTENER_H
 
 #include "events/mouseevent.h"
 
@@ -190,4 +190,4 @@ class MouseListener
         { }
 };
 
-#endif  // end GCN_MOUSELISTENER_HPP
+#endif  // LISTENERS_MOUSELISTENER_H
diff --git a/src/listeners/playerrelationslistener.h b/src/listeners/playerrelationslistener.h
index b95f18c33..6a8bf3b20 100644
--- a/src/listeners/playerrelationslistener.h
+++ b/src/listeners/playerrelationslistener.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LISTERNERS_PLAYERRELATIONSLISTENER_H
-#define LISTERNERS_PLAYERRELATIONSLISTENER_H
+#ifndef LISTENERS_PLAYERRELATIONSLISTENER_H
+#define LISTENERS_PLAYERRELATIONSLISTENER_H
 
 #include <string>
 
@@ -40,4 +40,4 @@ class PlayerRelationsListener
         { }
 };
 
-#endif  // LISTERNERS_PLAYERRELATIONSLISTENER_H
+#endif  // LISTENERS_PLAYERRELATIONSLISTENER_H
diff --git a/src/listeners/selectionlistener.h b/src/listeners/selectionlistener.h
index d3be0f0eb..2efe0a67e 100644
--- a/src/listeners/selectionlistener.h
+++ b/src/listeners/selectionlistener.h
@@ -61,8 +61,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_SELECTIONLISTENER_HPP
-#define GCN_SELECTIONLISTENER_HPP
+#ifndef LISTENERS_SELECTIONLISTENER_H
+#define LISTENERS_SELECTIONLISTENER_H
 
 #include <string>
 
@@ -111,4 +111,4 @@ class SelectionListener
         { }
 };
 
-#endif  // end GCN_SELECTIONLISTENER_HPP
+#endif  // LISTENERS_SELECTIONLISTENER_H
diff --git a/src/listeners/widgetlistener.h b/src/listeners/widgetlistener.h
index 16d9e1f15..48641cbaa 100644
--- a/src/listeners/widgetlistener.h
+++ b/src/listeners/widgetlistener.h
@@ -61,8 +61,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LISTENERS_WIDGETLISTENER_HPP
-#define LISTENERS_WIDGETLISTENER_HPP
+#ifndef LISTENERS_WIDGETLISTENER_H
+#define LISTENERS_WIDGETLISTENER_H
 
 #include <string>
 
@@ -137,4 +137,4 @@ class WidgetListener
         { }
 };
 
-#endif  // LISTENERS_WIDGETLISTENER_HPP
+#endif  // LISTENERS_WIDGETLISTENER_H