glsl: Clean up header file inclusion.

diff --git a/src/glsl/apps/compile.c b/src/glsl/apps/compile.c
index 3aa4fd4d53e7c3b88075ba8126bac929693c9134..5114fc9d0be4fb884ba6845050f5226d5fa94706 100644 (file)
--- a/src/glsl/apps/compile.c
+++ b/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"
 
 

diff --git a/src/glsl/apps/process.c b/src/glsl/apps/process.c
index caf72a71cf149f02ed7188513383f7514caeb4a9..6d5ce6eea3f808bb1891ca245030ffbd0a804987 100644 (file)
--- a/src/glsl/apps/process.c
+++ b/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

diff --git a/src/glsl/apps/purify.c b/src/glsl/apps/purify.c
index 0f09b157efd7075868e83cbc0878f6e475215cb5..e3fca59ab450a6b06611e366103cba5e8ec21753 100644 (file)
--- a/src/glsl/apps/purify.c
+++ b/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

diff --git a/src/glsl/apps/tokenise.c b/src/glsl/apps/tokenise.c
index f89f47d0611631a6b269e3677b8b0078d6021b71..3d68334bed39fb801eff5f59e1a01638928a80c9 100644 (file)
--- a/src/glsl/apps/tokenise.c
+++ b/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

diff --git a/src/glsl/apps/version.c b/src/glsl/apps/version.c
index fa5c226da835d40c0c367e3bf3db7b358d8c9b55..8506f35ba11586b4eb5dd8f8985f098d1c76a7fe 100644 (file)
--- a/src/glsl/apps/version.c
+++ b/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

diff --git a/src/glsl/cl/sl_cl_parse.c b/src/glsl/cl/sl_cl_parse.c
index 09456f5219ae0e32edf1b6cdd32576637b657e51..c1bc6031ce6b26490cdf2aa16997e84935d02f5a 100644 (file)
--- a/src/glsl/cl/sl_cl_parse.c
+++ b/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"
 
 

diff --git a/src/glsl/pp/sl_pp_context.c b/src/glsl/pp/sl_pp_context.c
index 74a9bdddfdc13f44e9089f952aa22a0ca7f0391e..b8e1e99fc8683e47d956fdf4ae9f792d267f4e16 100644 (file)
--- a/src/glsl/pp/sl_pp_context.c
+++ b/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"
 

diff --git a/src/glsl/pp/sl_pp_context.h b/src/glsl/pp/sl_pp_context.h
index 8abb9708b85c05d6defdc015ab8526c37437af8d..e6244f625752f475e13a9433b8a2cea3a35e6020 100644 (file)
--- a/src/glsl/pp/sl_pp_context.h
+++ b/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"

diff --git a/src/glsl/pp/sl_pp_define.c b/src/glsl/pp/sl_pp_define.c
index 808a6a0d4f18384058d91f8b745ba3070d96b8a4..370e6aa66066b45a22248ca0149acaf830f4bcbe 100644 (file)
--- a/src/glsl/pp/sl_pp_define.c
+++ b/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

diff --git a/src/glsl/pp/sl_pp_error.c b/src/glsl/pp/sl_pp_error.c
index b628e37ce83b1296617858e34171a23432fe16f6..482b67fcafbe4b90f6ac182d4b95cad6543fa77c 100644 (file)
--- a/src/glsl/pp/sl_pp_error.c
+++ b/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

diff --git a/src/glsl/pp/sl_pp_expression.c b/src/glsl/pp/sl_pp_expression.c
index ec904787dd77dfedf90ad8b46a00235ce1337e11..c3f48356b0902b27943169898d6c2692e26063bc 100644 (file)
--- a/src/glsl/pp/sl_pp_expression.c
+++ b/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 {

diff --git a/src/glsl/pp/sl_pp_expression.h b/src/glsl/pp/sl_pp_expression.h
index 377d5b4cbd9caefd9cc08f6a33e81fefe0713b2b..522263bb259b00f16dc37fb4dd2c46529e005066 100644 (file)
--- a/src/glsl/pp/sl_pp_expression.h
+++ b/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

diff --git a/src/glsl/pp/sl_pp_extension.c b/src/glsl/pp/sl_pp_extension.c
index d119677c268dd694c014fe03bb789c76e872592c..00dbdcf22bc9524b4017b8cc7eb01efa4e40b322 100644 (file)
--- a/src/glsl/pp/sl_pp_extension.c
+++ b/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"
 
 
 /**

diff --git a/src/glsl/pp/sl_pp_if.c b/src/glsl/pp/sl_pp_if.c
index 25cb7a3ca111273c6fe4a993147b360c34171cc0..6b7a1590b42f482df12dcf4c4cc0795abc461417 100644 (file)
--- a/src/glsl/pp/sl_pp_if.c
+++ b/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

diff --git a/src/glsl/pp/sl_pp_line.c b/src/glsl/pp/sl_pp_line.c
index 6f7e9eb562cca672a93e8279511539f847c24cfe..51581c7bb59f60ac16726bfe801f66247de9091a 100644 (file)
--- a/src/glsl/pp/sl_pp_line.c
+++ b/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

diff --git a/src/glsl/pp/sl_pp_macro.c b/src/glsl/pp/sl_pp_macro.c
index 9f520b8fc5394b3d3b109d4924bd4ac5a4919fdf..2cf9ea342b230be7cb72d4cbc539f7dc7099722c 100644 (file)
--- a/src/glsl/pp/sl_pp_macro.c
+++ b/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

diff --git a/src/glsl/pp/sl_pp_macro.h b/src/glsl/pp/sl_pp_macro.h
index 1d210681091800b07e0e76c627d9f587fc1dcc55..6e65a0a588d9d7a82ec3fa5440ab0ecfe7cf327e 100644 (file)
--- a/src/glsl/pp/sl_pp_macro.h
+++ b/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;

diff --git a/src/glsl/pp/sl_pp_pragma.c b/src/glsl/pp/sl_pp_pragma.c
index caf4c63f657ebcf0db2131bbe08f1d37733a955b..6789704db0c0a1f8fd3e3fa123923e682b27450f 100644 (file)
--- a/src/glsl/pp/sl_pp_pragma.c
+++ b/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

diff --git a/src/glsl/pp/sl_pp_process.c b/src/glsl/pp/sl_pp_process.c
index 315ad9bf1cd4ebf9460719b07eefab2e0e22f4b0..2f12393237ce493c9f88a8322c9f18d60c0bd6bd 100644 (file)
--- a/src/glsl/pp/sl_pp_process.c
+++ b/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

diff --git a/src/glsl/pp/sl_pp_process.h b/src/glsl/pp/sl_pp_process.h
index fe6ff0d4648e97edc5828d91ac0040d82e9da670..04e9be43989850eb3adae601b4be79ef61df3950 100644 (file)
--- a/src/glsl/pp/sl_pp_process.h
+++ b/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;

diff --git a/src/glsl/pp/sl_pp_public.h b/src/glsl/pp/sl_pp_public.h
index ca6f722543dbfa1ea50b5d1a1b2806883bce4977..66ced6cf58987909cae7206a62364694639c6e10 100644 (file)
--- a/src/glsl/pp/sl_pp_public.h
+++ b/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,

diff --git a/src/glsl/pp/sl_pp_token_util.c b/src/glsl/pp/sl_pp_token_util.c
index c85263d9a11b59bf69639041de1b26cfe45a000d..43be49670b08394b89635b7f6453beaaba9380a2 100644 (file)
--- a/src/glsl/pp/sl_pp_token_util.c
+++ b/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

diff --git a/src/glsl/pp/sl_pp_token_util.h b/src/glsl/pp/sl_pp_token_util.h
index 2a668ad0a84d182cac67fbd7b2263fc7d6429f3c..35d72101ca5dc9348a531e5a40e7f857410c7bb5 100644 (file)
--- a/src/glsl/pp/sl_pp_token_util.h
+++ b/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;
 
 /*

diff --git a/src/glsl/pp/sl_pp_version.c b/src/glsl/pp/sl_pp_version.c
index 3c995b77501bf651ab8a51344383f90cff706539..6735c05e8ae327b199b3a7107c9f7c1f8e8f9786 100644 (file)
--- a/src/glsl/pp/sl_pp_version.c
+++ b/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