diff --git a/src/frontends/NoGuiFontLoader.h b/src/frontends/NoGuiFontLoader.h
index 9510bb3027..e22c7ea5ca 100644
--- a/src/frontends/NoGuiFontLoader.h
+++ b/src/frontends/NoGuiFontLoader.h
@@ -9,18 +9,17 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef LYX_NO_GUI_FONTLOADER_H
-#define LYX_NO_GUI_FONTLOADER_H
+#ifndef NO_GUI_FONTLOADER_H
+#define NO_GUI_FONTLOADER_H
 
 #include "frontends/FontLoader.h"
-
 #include "frontends/NoGuiFontMetrics.h"
 
 namespace lyx {
 namespace frontend {
 
 /// Dummy FontLoader for command-line output.
-class NoGuiFontLoader: public FontLoader
+class NoGuiFontLoader : public FontLoader
 {
 public:
 	///
@@ -29,10 +28,10 @@ public:
 	virtual ~NoGuiFontLoader() {}
 
 	/// Update fonts after zoom, dpi, font names, or norm change
-	virtual void update() {};
+	virtual void update() {}
 
 	/// Is the given font available ?
-	virtual bool available(FontInfo const &) { return false; };
+	virtual bool available(FontInfo const &) { return false; }
 
 	/// Get the Font metrics for this FontInfo
 	virtual FontMetrics const & metrics(FontInfo const &) { return metrics_; }
@@ -45,4 +44,4 @@ private:
 } // namespace frontend
 } // namespace lyx
 
-#endif // LYX_NO_GUI_FONTLOADER_H
+#endif // NO_GUI_FONTLOADER_H