glsl: Clean up header file inclusion.

src/glsl/apps/compile.c

@@ -30,6 +30,7 @@
 #include <string.h>
 #include <assert.h>
 #include "../pp/sl_pp_public.h"
+#include "../pp/sl_pp_purify.h"
 #include "../cl/sl_cl_parse.h"
 
 

src/glsl/apps/process.c

@@ -30,6 +30,8 @@
 #include <string.h>
 #include <assert.h>
 #include "../pp/sl_pp_public.h"
+#include "../pp/sl_pp_purify.h"
+#include "../pp/sl_pp_token.h"
 
 
 int

src/glsl/apps/purify.c

@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "../pp/sl_pp_public.h"
+#include "../pp/sl_pp_purify.h"
 
 
 int

src/glsl/apps/tokenise.c

@@ -30,6 +30,8 @@
 #include <string.h>
 #include <assert.h>
 #include "../pp/sl_pp_public.h"
+#include "../pp/sl_pp_purify.h"
+#include "../pp/sl_pp_token.h"
 
 
 int

src/glsl/apps/version.c

@@ -30,6 +30,7 @@
 #include <string.h>
 #include <assert.h>
 #include "../pp/sl_pp_public.h"
+#include "../pp/sl_pp_purify.h"
 
 
 int

src/glsl/cl/sl_cl_parse.c

@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "../pp/sl_pp_public.h"
+#include "../pp/sl_pp_token.h"
 #include "sl_cl_parse.h"
 
 

src/glsl/pp/sl_pp_context.c

@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "sl_pp_macro.h"
 #include "sl_pp_public.h"
 #include "sl_pp_context.h"
 

src/glsl/pp/sl_pp_context.h

@@ -29,7 +29,6 @@
 #define SL_PP_CONTEXT_H
 
 #include "sl_pp_dict.h"
-#include "sl_pp_macro.h"
 #include "sl_pp_process.h"
 #include "sl_pp_purify.h"
 #include "sl_pp_token_util.h"

src/glsl/pp/sl_pp_define.c

@@ -28,8 +28,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "sl_pp_context.h"
+#include "sl_pp_macro.h"
 #include "sl_pp_process.h"
 #include "sl_pp_public.h"
+#include "sl_pp_token.h"
 
 
 static void

src/glsl/pp/sl_pp_error.c

@@ -30,6 +30,7 @@
 #include "sl_pp_context.h"
 #include "sl_pp_process.h"
 #include "sl_pp_public.h"
+#include "sl_pp_token.h"
 
 
 void

src/glsl/pp/sl_pp_expression.c

@@ -27,8 +27,10 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "sl_pp_context.h"
 #include "sl_pp_expression.h"
 #include "sl_pp_public.h"
+#include "sl_pp_token.h"
 
 
 struct parse_context {

src/glsl/pp/sl_pp_expression.h

@@ -28,8 +28,8 @@
 #ifndef SL_PP_EXPRESSION_H
 #define SL_PP_EXPRESSION_H
 
-#include "sl_pp_context.h"
-#include "sl_pp_token.h"
+struct sl_pp_context;
+struct sl_pp_token_info;
 
 
 int

src/glsl/pp/sl_pp_extension.c

@@ -25,11 +25,13 @@
  * 
  **************************************************************************/
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include "sl_pp_context.h"
 #include "sl_pp_process.h"
 #include "sl_pp_public.h"
+#include "sl_pp_token.h"
 
 
 /**

src/glsl/pp/sl_pp_if.c

@@ -27,8 +27,11 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "sl_pp_context.h"
 #include "sl_pp_expression.h"
+#include "sl_pp_macro.h"
 #include "sl_pp_process.h"
+#include "sl_pp_token.h"
 
 
 static int

src/glsl/pp/sl_pp_line.c

@@ -28,8 +28,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "sl_pp_context.h"
+#include "sl_pp_macro.h"
 #include "sl_pp_public.h"
 #include "sl_pp_process.h"
+#include "sl_pp_token.h"
 
 
 int

src/glsl/pp/sl_pp_macro.c

@@ -32,6 +32,7 @@
 #include "sl_pp_public.h"
 #include "sl_pp_macro.h"
 #include "sl_pp_process.h"
+#include "sl_pp_token.h"
 
 
 static void

src/glsl/pp/sl_pp_macro.h

@@ -28,9 +28,6 @@
 #ifndef SL_PP_MACRO_H
 #define SL_PP_MACRO_H
 
-#include "sl_pp_token.h"
-
-
 struct sl_pp_context;
 struct sl_pp_process_state;
 struct sl_pp_token_buffer;

src/glsl/pp/sl_pp_pragma.c

@@ -29,6 +29,7 @@
 #include <string.h>
 #include "sl_pp_context.h"
 #include "sl_pp_process.h"
+#include "sl_pp_token.h"
 
 
 int

src/glsl/pp/sl_pp_process.c

@@ -25,11 +25,14 @@
  * 
  **************************************************************************/
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include "sl_pp_context.h"
+#include "sl_pp_macro.h"
 #include "sl_pp_process.h"
 #include "sl_pp_public.h"
+#include "sl_pp_token.h"
 
 
 int

src/glsl/pp/sl_pp_process.h

@@ -28,11 +28,8 @@
 #ifndef SL_PP_PROCESS_H
 #define SL_PP_PROCESS_H
 
-#include "sl_pp_macro.h"
-#include "sl_pp_token.h"
-
-
 struct sl_pp_context;
+struct sl_pp_token_buffer;
 
 struct sl_pp_process_state {
    struct sl_pp_token_info *out;

src/glsl/pp/sl_pp_public.h

@@ -28,13 +28,9 @@
 #ifndef SL_PP_PUBLIC_H
 #define SL_PP_PUBLIC_H
 
-
 struct sl_pp_context;
-
-
-#include "sl_pp_purify.h"
-#include "sl_pp_token.h"
-
+struct sl_pp_purify_options;
+struct sl_pp_token_info;
 
 struct sl_pp_context *
 sl_pp_context_create(const char *input,

src/glsl/pp/sl_pp_token_util.c

@@ -28,6 +28,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include "sl_pp_token_util.h"
+#include "sl_pp_token.h"
 
 
 int

src/glsl/pp/sl_pp_token_util.h

@@ -28,11 +28,6 @@
 #ifndef SL_PP_TOKEN_UTIL_H
 #define SL_PP_TOKEN_UTIL_H
 
-#include <assert.h>
-#include <stdlib.h>
-#include "sl_pp_token.h"
-
-
 struct sl_pp_context;
 
 /*

src/glsl/pp/sl_pp_version.c

@@ -29,6 +29,7 @@
 #include <string.h>
 #include "sl_pp_public.h"
 #include "sl_pp_context.h"
+#include "sl_pp_token.h"
 
 
 int