diff --git a/src/ChangeLog b/src/ChangeLog
index 1a79aca399..5baf028b87 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-20  Angus Leeming  <leeming@lyx.org>
+
+	* Makefile.am (lyx_SOURCES): move format.[Ch] and graph.[Ch] so that
+	files are compiled in alphabetical order again.
+
+	* gettext.h: #ifndef _GETTEXT_H_ -> #ifndef GETTEXT_H.
+
 2003-05-19  Angus Leeming  <leeming@lyx.org>
 
 	* gettext.[Ch]: remove "char const * _(char const *)".
diff --git a/src/Makefile.am b/src/Makefile.am
index db9abb5441..61834c4844 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,8 +131,12 @@ lyx_SOURCES = \
 	gettext.h \
 	factory.h \
 	factory.C \
+	format.C \
+	format.h \
 	funcrequest.h \
 	funcrequest.C \
+	graph.C \
+	graph.h \
 	importer.C \
 	importer.h \
 	intl.C \
@@ -239,11 +243,7 @@ lyx_SOURCES = \
 	version.C \
 	version.h \
 	vspace.C \
-	vspace.h \
-	graph.C \
-	graph.h \
-	format.C \
-	format.h
+	vspace.h
 
 lyx_main.o: lyx_main.C lyx_main.h config.h version.h \
 	lyxrc.h support/path.h support/filetools.h \
diff --git a/src/gettext.h b/src/gettext.h
index f19d4508ce..d1413cac82 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -9,8 +9,8 @@
  *
  * Full author contact details are available in file CREDITS
  */
-#ifndef _GETTEXT_H_
-#define _GETTEXT_H_
+#ifndef GETTEXT_H
+#define GETTEXT_H
 
 /*
  * Native Language Support