diff --git a/src/system.h b/src/system.h
index 55a0079..600e2fb 100644
--- a/src/system.h
+++ b/src/system.h
@@ -9,8 +9,8 @@
   Author: John Zaitseff <J.Zaitseff@zap.org.au>
   $Id$
 
-  This file, system.h, contains system #include directives for Star
-  Traders.
+  This file, system.h, contains system-specific definitions and #include
+  directives for Star Traders.
 
 
   This program is free software: you can redistribute it and/or modify it
@@ -72,7 +72,7 @@
 #elif defined(HAVE_CURSES_H)
 #  include <curses.h>
 #else
-#  error SysV-compatible curses library required
+#  error "X/Open-compatible curses library required"
 #endif
 
 
diff --git a/src/trader.c b/src/trader.c
index 8f5e5e2..6e625fe 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -278,11 +278,11 @@ void init_program (void)
     // Initialise the random number generator
     init_rand();
 
-    // Initialise the terminal display
-    init_screen();
-
     // Initialise signal-handling functions
     // @@@ To be completed
+
+    // Initialise the terminal display
+    init_screen();
 }
 
 
diff --git a/src/trader.h b/src/trader.h
index 74b0762..d429c40 100644
--- a/src/trader.h
+++ b/src/trader.h
@@ -10,6 +10,7 @@
   $Id$
 
   This file, trader.h, contains overall definitions for Star Traders.
+  This allows source files to include just one file: this one.
 
 
   This program is free software: you can redistribute it and/or modify it
@@ -32,18 +33,7 @@
 
 
 /************************************************************************
-*                          Global definitions                           *
-************************************************************************/
-
-#define GAME_FILE_HEADER	PACKAGE_NAME " Saved Game"
-#define GAME_FILE_API_VERSION	"7.0"	// For game loads and saves
-#define GAME_FILE_SENTINEL	(42)	// End of game file sentinel
-
-#define BUFSIZE			(1024)	// For various string buffers
-
-
-/************************************************************************
-*                     Program-specific header files                     *
+*                         Included header files                         *
 ************************************************************************/
 
 #include "system.h"
@@ -58,4 +48,15 @@
 #include "utils.h"
 
 
+/************************************************************************
+*                          Global definitions                           *
+************************************************************************/
+
+#define GAME_FILE_HEADER	PACKAGE_NAME " Saved Game"
+#define GAME_FILE_API_VERSION	"7.0"	// For game loads and saves
+#define GAME_FILE_SENTINEL	(42)	// End of game file sentinel
+
+#define BUFSIZE			(1024)	// For various string buffers
+
+
 #endif /* included_TRADER_H */