[project @ 2005-02-23 11:03:42 by simonmar]

rearrange includes

19 files changed, 19 insertions, 18 deletions

diff --git a/ghc/utils/hp2ps/AreaBelow.c b/ghc/utils/hp2ps/AreaBelow.c
index 3bb98d908c..ec80e1ed48 100644
--- a/ghc/utils/hp2ps/AreaBelow.c
+++ b/ghc/utils/hp2ps/AreaBelow.c
@@ -1,6 +1,6 @@
+#include "Main.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Error.h"
 #include "HpFile.h"
diff --git a/ghc/utils/hp2ps/AuxFile.c b/ghc/utils/hp2ps/AuxFile.c
index e5ce090234..06cfd6ccfd 100644
--- a/ghc/utils/hp2ps/AuxFile.c
+++ b/ghc/utils/hp2ps/AuxFile.c
@@ -1,7 +1,7 @@
+#include "Main.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Shade.h"
 #include "Error.h"
diff --git a/ghc/utils/hp2ps/Axes.c b/ghc/utils/hp2ps/Axes.c
index 0733edd2e8..a2641cd676 100644
--- a/ghc/utils/hp2ps/Axes.c
+++ b/ghc/utils/hp2ps/Axes.c
@@ -1,6 +1,6 @@
+#include "Main.h"
 #include <stdio.h>
 #include <string.h>
-#include "Main.h"
 #include "Curves.h"
 #include "Defines.h"
 #include "Dimensions.h"
diff --git a/ghc/utils/hp2ps/Curves.c b/ghc/utils/hp2ps/Curves.c
index 72c8eb2d6f..ec05c98336 100644
--- a/ghc/utils/hp2ps/Curves.c
+++ b/ghc/utils/hp2ps/Curves.c
@@ -1,6 +1,6 @@
+#include "Main.h"
 #include <stdio.h>
 #include <math.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Dimensions.h"
 #include "HpFile.h"
diff --git a/ghc/utils/hp2ps/Deviation.c b/ghc/utils/hp2ps/Deviation.c
index 81a16df408..ecf7faba16 100644
--- a/ghc/utils/hp2ps/Deviation.c
+++ b/ghc/utils/hp2ps/Deviation.c
@@ -1,8 +1,8 @@
+#include "Main.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Error.h"
 #include "HpFile.h"
diff --git a/ghc/utils/hp2ps/Dimensions.c b/ghc/utils/hp2ps/Dimensions.c
index b0d1bd53e0..e732402dac 100644
--- a/ghc/utils/hp2ps/Dimensions.c
+++ b/ghc/utils/hp2ps/Dimensions.c
@@ -1,7 +1,7 @@
+#include "Main.h"
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>
-#include "Main.h"
 #include "Defines.h"
 #include "HpFile.h"
 #include "Scale.h"
diff --git a/ghc/utils/hp2ps/Error.c b/ghc/utils/hp2ps/Error.c
index 7c67646525..809c24ea44 100644
--- a/ghc/utils/hp2ps/Error.c
+++ b/ghc/utils/hp2ps/Error.c
@@ -1,7 +1,7 @@
+#include "Main.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "Main.h"
 #include "Defines.h"
 
 /* own stuff */
diff --git a/ghc/utils/hp2ps/HpFile.c b/ghc/utils/hp2ps/HpFile.c
index adcbc15da7..2fe5e06663 100644
--- a/ghc/utils/hp2ps/HpFile.c
+++ b/ghc/utils/hp2ps/HpFile.c
@@ -1,8 +1,8 @@
+#include "Main.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Error.h"
 #include "HpFile.h"
diff --git a/ghc/utils/hp2ps/Key.c b/ghc/utils/hp2ps/Key.c
index a8a761dee0..8c63721c74 100644
--- a/ghc/utils/hp2ps/Key.c
+++ b/ghc/utils/hp2ps/Key.c
@@ -1,6 +1,6 @@
+#include "Main.h"
 #include <stdio.h>
 #include <math.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Dimensions.h"
 #include "HpFile.h"
diff --git a/ghc/utils/hp2ps/Main.c b/ghc/utils/hp2ps/Main.c
index e1cfe636df..3b5efed51b 100644
--- a/ghc/utils/hp2ps/Main.c
+++ b/ghc/utils/hp2ps/Main.c
@@ -1,7 +1,7 @@
+#include "Main.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "Main.h"
 #include "Defines.h"
 #include "AuxFile.h"
 #include "AreaBelow.h"
diff --git a/ghc/utils/hp2ps/Main.h b/ghc/utils/hp2ps/Main.h
index e25b562c7b..30e7a7e9be 100644
--- a/ghc/utils/hp2ps/Main.h
+++ b/ghc/utils/hp2ps/Main.h
@@ -2,6 +2,7 @@
 #define MAIN_H
 
 #include "../includes/ghcconfig.h"
+#include <stdio.h>
 
 #ifdef __STDC__
 #define PROTO(x)	x
diff --git a/ghc/utils/hp2ps/Marks.c b/ghc/utils/hp2ps/Marks.c
index 27702c73d9..8d6f924e17 100644
--- a/ghc/utils/hp2ps/Marks.c
+++ b/ghc/utils/hp2ps/Marks.c
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include "Main.h"
+#include <stdio.h>
 #include "Curves.h"
 #include "Dimensions.h"
 #include "HpFile.h"
diff --git a/ghc/utils/hp2ps/PsFile.c b/ghc/utils/hp2ps/PsFile.c
index 40b08dab85..357f826259 100644
--- a/ghc/utils/hp2ps/PsFile.c
+++ b/ghc/utils/hp2ps/PsFile.c
@@ -1,6 +1,6 @@
+#include "Main.h"
 #include <stdio.h>
 #include <string.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Dimensions.h"
 #include "Curves.h"
diff --git a/ghc/utils/hp2ps/Reorder.c b/ghc/utils/hp2ps/Reorder.c
index 94bda2c5b4..afeed52d85 100644
--- a/ghc/utils/hp2ps/Reorder.c
+++ b/ghc/utils/hp2ps/Reorder.c
@@ -1,7 +1,7 @@
+#include "Main.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Error.h"
 #include "HpFile.h"
diff --git a/ghc/utils/hp2ps/Scale.c b/ghc/utils/hp2ps/Scale.c
index 2b557d71af..32120407b3 100644
--- a/ghc/utils/hp2ps/Scale.c
+++ b/ghc/utils/hp2ps/Scale.c
@@ -1,6 +1,6 @@
+#include "Main.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Dimensions.h"
 #include "Error.h"
diff --git a/ghc/utils/hp2ps/Shade.c b/ghc/utils/hp2ps/Shade.c
index 2920fb68a4..9e3274bf69 100644
--- a/ghc/utils/hp2ps/Shade.c
+++ b/ghc/utils/hp2ps/Shade.c
@@ -1,7 +1,7 @@
+#include "Main.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Error.h"
 #include "Utilities.h"
diff --git a/ghc/utils/hp2ps/TopTwenty.c b/ghc/utils/hp2ps/TopTwenty.c
index 10de7bbaff..bbb6be4390 100644
--- a/ghc/utils/hp2ps/TopTwenty.c
+++ b/ghc/utils/hp2ps/TopTwenty.c
@@ -1,6 +1,6 @@
+#include "Main.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "Main.h"
 #include "Defines.h"
 #include "Error.h"
 #include "HpFile.h"
diff --git a/ghc/utils/hp2ps/TraceElement.c b/ghc/utils/hp2ps/TraceElement.c
index 787ff7b749..c14062dced 100644
--- a/ghc/utils/hp2ps/TraceElement.c
+++ b/ghc/utils/hp2ps/TraceElement.c
@@ -1,6 +1,6 @@
+#include "Main.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "Main.h"
 #include "Defines.h"
 #include "HpFile.h"
 #include "Error.h"
diff --git a/ghc/utils/hp2ps/Utilities.c b/ghc/utils/hp2ps/Utilities.c
index 4589327e27..c9fb612f0e 100644
--- a/ghc/utils/hp2ps/Utilities.c
+++ b/ghc/utils/hp2ps/Utilities.c
@@ -1,6 +1,6 @@
+#include "Main.h"
 #include <stdio.h>
 #include <string.h>
-#include "Main.h"
 #include "Error.h"
 
 extern void* malloc();