rationalize order of header file inclusions

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1805 9d0c8265-081b-0410-96cb-a4ca84ce46f8

10 files changed, 20 insertions, 11 deletions

diff --git a/urt/cmd_name.c b/urt/cmd_name.c
index 1f8f0edf..31fe5f42 100644
--- a/urt/cmd_name.c
+++ b/urt/cmd_name.c
@@ -26,6 +26,9 @@
  */
 
 #include "rle.h"
+
+
+
 static char no_name[] = "(no-name)";
 
 char *
diff --git a/urt/rle_addhist.c b/urt/rle_addhist.c
index 3ddcbf8c..b1651754 100644
--- a/urt/rle_addhist.c
+++ b/urt/rle_addhist.c
@@ -25,14 +25,13 @@
  * Copyright (c) 1988, Curtin University of Technology
  */
 
-#include "rle.h"
-
 #include <string.h>
 #include <stdio.h>
-
 #include <time.h>
 
 #include "netpbm/mallocvar.h"
+#include "rle.h"
+
 
 /*****************************************************************
  * TAG( rle_addhist )
diff --git a/urt/rle_config.h b/urt/rle_config.h
index c1f4629d..57126a18 100644
--- a/urt/rle_config.h
+++ b/urt/rle_config.h
@@ -1,3 +1,5 @@
+#ifndef RLE_CONFIG_H_INCLUDED
+#define RLE_CONFIG_H_INCLUDED
 #include "pm_config.h"
 #if MSVCRT
 #define NO_OPEN_PIPES
@@ -80,3 +82,5 @@ extern char *getenv( CONST_DECL char *name );
 #ifdef NEED_SETLINEBUF
 #   define setlinebuf( _s )	setvbuf( (_s), NULL, _IOLBF, 0 )
 #endif
+
+#endif
diff --git a/urt/rle_error.c b/urt/rle_error.c
index a1d63451..da314f0b 100644
--- a/urt/rle_error.c
+++ b/urt/rle_error.c
@@ -27,8 +27,8 @@
 
 #include <string.h>
 
-#include "rle.h"
 #include "rle_config.h"
+#include "rle.h"
 
 /*****************************************************************
  * TAG( rle_alloc_error )
diff --git a/urt/rle_getcom.c b/urt/rle_getcom.c
index 20da56a9..4226eaaf 100644
--- a/urt/rle_getcom.c
+++ b/urt/rle_getcom.c
@@ -26,6 +26,7 @@
  */
 
 #include <stdio.h>
+
 #include "rle.h"
 
 /*****************************************************************
diff --git a/urt/rle_global.c b/urt/rle_global.c
index 90d3f975..6014a229 100644
--- a/urt/rle_global.c
+++ b/urt/rle_global.c
@@ -31,6 +31,8 @@
  */
 
 #include <stdio.h>
+
+#include "rle_config.h"
 #include "rle_put.h"
 #include "rle.h"
 #include "Runput.h"
diff --git a/urt/rle_hdr.c b/urt/rle_hdr.c
index 3cd13545..1611324c 100644
--- a/urt/rle_hdr.c
+++ b/urt/rle_hdr.c
@@ -25,11 +25,11 @@
  * Copyright (c) 1991, University of Michigan
  */
 
-#include "rle.h"
-#include "rle_config.h"
-
 #include <string.h>
 
+#include "rle_config.h"
+#include "rle.h"
+
 /*****************************************************************
  * TAG( rle_names )
  *
diff --git a/urt/rle_open_f.c b/urt/rle_open_f.c
index 7290091e..ae8548b9 100644
--- a/urt/rle_open_f.c
+++ b/urt/rle_open_f.c
@@ -17,8 +17,8 @@
 
 #include "netpbm/pm_c_util.h"
 #include "netpbm/nstring.h"
-#include "rle.h"
 #include "rle_config.h"
+#include "rle.h"
 
 
 
diff --git a/urt/rle_putrow.c b/urt/rle_putrow.c
index e85d83d8..399633e4 100644
--- a/urt/rle_putrow.c
+++ b/urt/rle_putrow.c
@@ -31,6 +31,7 @@
  */
  
 #include <stdio.h>
+
 #include "rle_put.h"
 #include "rle.h"
 
diff --git a/urt/scanargs.c b/urt/scanargs.c
index 7fa495de..f3af3342 100644
--- a/urt/scanargs.c
+++ b/urt/scanargs.c
@@ -40,15 +40,14 @@
  *  to have all "void" functions so declared.
  */
 
-#include "rle.h"
-#include "rle_config.h"
-
 #include <stdio.h>
 #include <ctype.h>
 #include <stdarg.h>
 
 #include "netpbm/pm_c_util.h"
 #include "netpbm/nstring.h"
+#include "rle_config.h"
+#include "rle.h"
 
 /* 
  * An explicit assumption is made in this code that all pointers look