diff --git a/src/lyxfr0.h b/src/lyxfr0.h
index 8f92db5e05..923a4af19b 100644
--- a/src/lyxfr0.h
+++ b/src/lyxfr0.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
-#ifndef _LYXFR0_H
-#define _LYXFR0_H
+#ifndef LYXFR0_H
+#define LYXFR0_H
 
 #ifdef __GNUG__
 #pragma interface
diff --git a/src/lyxfr1.C b/src/lyxfr1.C
index b2ede55857..ee35ba8982 100644
--- a/src/lyxfr1.C
+++ b/src/lyxfr1.C
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstring>
+#include <cstdlib>
 
 #ifdef __GNUG__
 #pragma implementation
diff --git a/src/lyxfr1.h b/src/lyxfr1.h
index e89a6ffb0b..e4307b0c70 100644
--- a/src/lyxfr1.h
+++ b/src/lyxfr1.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
-#ifndef _LYXFR1_H
-#define _LYXFR1_H
+#ifndef LYXFR1_H
+#define LYXFR1_H
 
 #ifdef __GNUG__
 #pragma interface