Index: code/pilotfile/csg.cpp
===================================================================
--- code/pilotfile/csg.cpp	(revision 9621)
+++ code/pilotfile/csg.cpp	(working copy)
@@ -25,17 +25,7 @@
 #include <sstream>
 
 
-static const unsigned int CSG_FILE_ID = 0x5f475343;	// "CSG_" in file
 
-// NOTE: Version should be bumped only for adding/removing sections or section
-//       content.  It should *NOT* be bumped for limit bumps or anything of
-//       that sort!
-//
-//   0 - initial version
-//   1 - re-add recent missions
-static const ubyte CSG_VERSION = 1;
-
-
 void pilotfile::csg_read_flags()
 {
 	// tips?
Index: code/pilotfile/csg_convert.cpp
===================================================================
--- code/pilotfile/csg_convert.cpp	(revision 9621)
+++ code/pilotfile/csg_convert.cpp	(working copy)
@@ -1093,8 +1093,8 @@
 	Assert( cfp != NULL );
 
 	// header and version
-	cfwrite_int(0x5f475343, cfp);
-	cfwrite_ubyte(0, cfp);
+	cfwrite_int(CSG_FILE_ID, cfp);
+	cfwrite_ubyte(CSG_VERSION, cfp);
 
 	// flags and info sections go first
 	csg_export_flags();
Index: code/pilotfile/pilotfile.h
===================================================================
--- code/pilotfile/pilotfile.h	(revision 9621)
+++ code/pilotfile/pilotfile.h	(working copy)
@@ -10,6 +10,20 @@
 struct player;
 
 
+// current pilot constants
+static const unsigned int PLR_FILE_ID = 0x5f524c50;	// "PLR_" in file
+static const unsigned int CSG_FILE_ID = 0x5f475343;	// "CSG_" in file
+// NOTE: Version should be bumped only for adding/removing sections or section
+//       content.  It should *NOT* be bumped for limit bumps or anything of
+//       that sort!
+//   0 - initial version
+//   1 - Adding support for the player is multi flag
+static const ubyte PLR_VERSION = 1;
+//   0 - initial version
+//   1 - re-add recent missions
+static const ubyte CSG_VERSION = 1;
+
+
 class pilotfile {
 	public:
 		pilotfile();
Index: code/pilotfile/pilotfile_convert.h
===================================================================
--- code/pilotfile/pilotfile_convert.h	(revision 9621)
+++ code/pilotfile/pilotfile_convert.h	(working copy)
@@ -26,6 +26,7 @@
 #include "mission/missioncampaign.h"
 #include "controlconfig/controlsconfig.h"
 #include "missionui/redalert.h"
+#include "pilotfile/pilotfile.h"
 
 
 
Index: code/pilotfile/plr.cpp
===================================================================
--- code/pilotfile/plr.cpp	(revision 9621)
+++ code/pilotfile/plr.cpp	(working copy)
@@ -18,17 +18,6 @@
 #include "playerman/managepilot.h"
 
 
-static const unsigned int PLR_FILE_ID = 0x5f524c50;	// "PLR_" in file
-
-// NOTE: Version should be bumped only for adding/removing sections or section
-//       content.  It should *NOT* be bumped for limit bumps or anything of
-//       that sort!
-//
-//   0 - initial version
-//   1 - Adding support for the player is multi flag
-static const ubyte PLR_VERSION = 1;
-
-
 void pilotfile::plr_read_flags()
 {
 	// tips?
Index: code/pilotfile/plr_convert.cpp
===================================================================
--- code/pilotfile/plr_convert.cpp	(revision 9621)
+++ code/pilotfile/plr_convert.cpp	(working copy)
@@ -816,8 +816,8 @@
 	Assert( cfp != NULL );
 
 	// header and version
-	cfwrite_int(0x5f524c50, cfp);
-	cfwrite_ubyte(0, cfp);
+	cfwrite_int(PLR_FILE_ID, cfp);
+	cfwrite_ubyte(PLR_VERSION, cfp);
 
 	// flags and info sections go first
 	plr_export_flags();
Index: code/pilotfile/pilotfile_convert.cpp
===================================================================
--- code/pilotfile/pilotfile_convert.cpp	(revision 9621)
+++ code/pilotfile/pilotfile_convert.cpp	(working copy)
@@ -3,6 +3,7 @@
 #include "pilotfile/pilotfile_convert.h"
 #include "cfile/cfile.h"
 #include "playerman/managepilot.h"
+#include "pilotfile/pilotfile.h"
 
 
 pilotfile_convert::pilotfile_convert()