diff --git a/doomsday/client/include/client/cl_infine.h b/doomsday/client/include/client/cl_infine.h
index fe11650e97..a6f24ae26a 100644
--- a/doomsday/client/include/client/cl_infine.h
+++ b/doomsday/client/include/client/cl_infine.h
@@ -20,8 +20,8 @@
  * Client-side InFine.
  */
 
-#ifndef LIBDENG_CLIENT_INFINE
-#define LIBDENG_CLIENT_INFINE
+#ifndef DENG_CLIENT_INFINE
+#define DENG_CLIENT_INFINE
 
 #include <de/reader.h>
 
@@ -45,4 +45,4 @@ void Cl_RequestFinaleSkip(void);
 } // extern "C"
 #endif
 
-#endif /* LIBDENG_CLIENT_INFINE */
+#endif /* DENG_CLIENT_INFINE */
diff --git a/doomsday/client/include/client/cl_player.h b/doomsday/client/include/client/cl_player.h
index 4f767957c0..d1a4ac761f 100644
--- a/doomsday/client/include/client/cl_player.h
+++ b/doomsday/client/include/client/cl_player.h
@@ -21,8 +21,8 @@
  * Clientside Player Management
  */
 
-#ifndef LIBDENG_CLIENT_PLAYER_H
-#define LIBDENG_CLIENT_PLAYER_H
+#ifndef DENG_CLIENT_PLAYER_H
+#define DENG_CLIENT_PLAYER_H
 
 #include "cl_mobj.h"
 
@@ -81,4 +81,4 @@ boolean         ClPlayer_IsFreeToMove(int plrnum);
 } // extern "C"
 #endif
 
-#endif // LIBDENG_CLIENT_PLAYER_H
+#endif // DENG_CLIENT_PLAYER_H
diff --git a/doomsday/client/include/game.h b/doomsday/client/include/game.h
index 075bb7813e..4372d3b322 100644
--- a/doomsday/client/include/game.h
+++ b/doomsday/client/include/game.h
@@ -136,7 +136,6 @@ class Game
     bool isRequiredFile(File1 &file);
 
 public:
-
     /**
      * Construct a new Game instance from the specified definition @a def.
      *