24 files changed, 30 insertions, 29 deletions
diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript
index bb579930f52..9516dc5a3c2 100644
--- a/src/gallium/state_trackers/wgl/SConscript
+++ b/src/gallium/state_trackers/wgl/SConscript
@@ -8,6 +8,7 @@ if env['platform'] in ['windows']:
      
     env.Append(CPPPATH = [
     	'#src/mesa',
+    	'.',
     ])
      
     env.Append(CPPDEFINES = [
@@ -18,19 +19,19 @@ if env['platform'] in ['windows']:
     ])
      
     sources = [
-        'stw_device.c',
-        'stw_framebuffer.c',
-        'stw_icd.c',
-        'stw_pixelformat.c',
-        'stw_quirks.c',
-        'stw_wgl_arbextensionsstring.c',
-        'stw_wgl_arbmultisample.c',
-        'stw_wgl_arbpixelformat.c',
-        #'stw_wgl.c',
-        'stw_wgl_context.c',
-        'stw_wgl_getprocaddress.c',
-        'stw_wgl_pixelformat.c',
-        'stw_wgl_swapbuffers.c',
+        'icd/stw_icd.c',
+        'shared/stw_device.c',
+        'shared/stw_framebuffer.c',
+        'shared/stw_pixelformat.c',
+        'shared/stw_quirks.c',
+        'wgl/stw_wgl_arbextensionsstring.c',
+        'wgl/stw_wgl_arbmultisample.c',
+        'wgl/stw_wgl_arbpixelformat.c',
+        #'wgl/stw_wgl.c',
+        'wgl/stw_wgl_context.c',
+        'wgl/stw_wgl_getprocaddress.c',
+        'wgl/stw_wgl_pixelformat.c',
+        'wgl/stw_wgl_swapbuffers.c',
     ]
 
     wgl = env.ConvenienceLibrary(
diff --git a/src/gallium/state_trackers/wgl/stw_icd.c b/src/gallium/state_trackers/wgl/icd/stw_icd.c
index 1dddc242097..bf057eb83bd 100644
--- a/src/gallium/state_trackers/wgl/stw_icd.c
+++ b/src/gallium/state_trackers/wgl/icd/stw_icd.c
@@ -32,9 +32,9 @@
 
 #include "pipe/p_debug.h"
 
-#include "stw_device.h"
-#include "stw_icd.h"
-#include "stw_wgl.h"
+#include "shared/stw_device.h"
+#include "icd/stw_icd.h"
+#include "wgl/stw_wgl.h"
 
 
 static HGLRC
diff --git a/src/gallium/state_trackers/wgl/stw_icd.h b/src/gallium/state_trackers/wgl/icd/stw_icd.h
index 8e676fb5b74..8e676fb5b74 100644
--- a/src/gallium/state_trackers/wgl/stw_icd.h
+++ b/src/gallium/state_trackers/wgl/icd/stw_icd.h
diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/state_trackers/wgl/shared/stw_device.c
index 129b24ce777..63ee066824e 100644
--- a/src/gallium/state_trackers/wgl/stw_device.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_device.c
@@ -31,9 +31,9 @@
 #include "pipe/p_winsys.h"
 #include "pipe/p_screen.h"
 
-#include "stw_device.h"
-#include "stw_winsys.h"
-#include "stw_pixelformat.h"
+#include "shared/stw_device.h"
+#include "shared/stw_winsys.h"
+#include "shared/stw_pixelformat.h"
 
 
 struct stw_device *stw_dev = NULL;
diff --git a/src/gallium/state_trackers/wgl/stw_device.h b/src/gallium/state_trackers/wgl/shared/stw_device.h
index e2020bf0554..2babc654daf 100644
--- a/src/gallium/state_trackers/wgl/stw_device.h
+++ b/src/gallium/state_trackers/wgl/shared/stw_device.h
@@ -29,7 +29,7 @@
 #define ST_DEVICE_H_
 
 
-#include "stw_icd.h"
+#include "icd/stw_icd.h"
 
 struct pipe_screen;
 
diff --git a/src/gallium/state_trackers/wgl/stw_framebuffer.c b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c
index 1ecafa451ee..1ecafa451ee 100644
--- a/src/gallium/state_trackers/wgl/stw_framebuffer.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c
diff --git a/src/gallium/state_trackers/wgl/stw_framebuffer.h b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.h
index 2e16e421f2c..2e16e421f2c 100644
--- a/src/gallium/state_trackers/wgl/stw_framebuffer.h
+++ b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.h
diff --git a/src/gallium/state_trackers/wgl/stw_pixelformat.c b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.c
index 7a054af3d3e..7a054af3d3e 100644
--- a/src/gallium/state_trackers/wgl/stw_pixelformat.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.c
diff --git a/src/gallium/state_trackers/wgl/stw_pixelformat.h b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h
index 0b67da8d25c..0b67da8d25c 100644
--- a/src/gallium/state_trackers/wgl/stw_pixelformat.h
+++ b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h
diff --git a/src/gallium/state_trackers/wgl/stw_quirks.c b/src/gallium/state_trackers/wgl/shared/stw_quirks.c
index bf1ec3fee76..bf1ec3fee76 100644
--- a/src/gallium/state_trackers/wgl/stw_quirks.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_quirks.c
diff --git a/src/gallium/state_trackers/wgl/stw_winsys.h b/src/gallium/state_trackers/wgl/shared/stw_winsys.h
index 8557327ccdd..8557327ccdd 100644
--- a/src/gallium/state_trackers/wgl/stw_winsys.h
+++ b/src/gallium/state_trackers/wgl/shared/stw_winsys.h
diff --git a/src/gallium/state_trackers/wgl/stw_wgl.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl.c
index 0528c369fc8..0528c369fc8 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl.c
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl.c
diff --git a/src/gallium/state_trackers/wgl/stw_wgl.h b/src/gallium/state_trackers/wgl/wgl/stw_wgl.h
index b86cc240f28..b86cc240f28 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl.h
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl.h
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbextensionsstring.c
index 04865796ec8..04865796ec8 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.c
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbextensionsstring.c
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.h b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbextensionsstring.h
index a0e4c5d98e8..a0e4c5d98e8 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_arbextensionsstring.h
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbextensionsstring.h
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbmultisample.c
index aad04e3e8a2..aad04e3e8a2 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.c
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbmultisample.c
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.h b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbmultisample.h
index de3e2cc6a33..de3e2cc6a33 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_arbmultisample.h
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbmultisample.h
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbpixelformat.c
index 344bb15d3c1..a1e6fc2ca4b 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.c
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbpixelformat.c
@@ -29,7 +29,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_memory.h"
-#include "stw_pixelformat.h"
+#include "shared/stw_pixelformat.h"
 #include "stw_wgl_arbmultisample.h"
 #include "stw_wgl_arbpixelformat.h"
 
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.h b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbpixelformat.h
index 5e480b822b3..5e480b822b3 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_arbpixelformat.h
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_arbpixelformat.h
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_context.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_context.c
index 890d97fd72a..da4688bcb17 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_context.c
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_context.c
@@ -33,10 +33,10 @@
 #include "pipe/p_context.h"
 #include "state_tracker/st_context.h"
 #include "state_tracker/st_public.h"
-#include "stw_device.h"
-#include "stw_winsys.h"
-#include "stw_framebuffer.h"
-#include "stw_pixelformat.h"
+#include "shared/stw_device.h"
+#include "shared/stw_winsys.h"
+#include "shared/stw_framebuffer.h"
+#include "shared/stw_pixelformat.h"
 #include "stw_wgl_arbmultisample.h"
 #include "stw_wgl_context.h"
 #include "stw_wgl.h"
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_context.h b/src/gallium/state_trackers/wgl/wgl/stw_wgl_context.h
index d87b3bdce23..d87b3bdce23 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_context.h
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_context.h
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_getprocaddress.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_getprocaddress.c
index ec92d2dfce2..ec92d2dfce2 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_getprocaddress.c
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_getprocaddress.c
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_pixelformat.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_pixelformat.c
index 7a8a2e22e49..4646f57a198 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_pixelformat.c
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_pixelformat.c
@@ -29,7 +29,7 @@
 
 #include "pipe/p_compiler.h"
 #include "pipe/p_debug.h"
-#include "stw_pixelformat.h"
+#include "shared/stw_pixelformat.h"
 #include "stw_wgl.h"
 
 static uint currentpixelformat = 0;
diff --git a/src/gallium/state_trackers/wgl/stw_wgl_swapbuffers.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_swapbuffers.c
index 002bcc64e72..c0af8bc4f6f 100644
--- a/src/gallium/state_trackers/wgl/stw_wgl_swapbuffers.c
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl_swapbuffers.c
@@ -32,9 +32,9 @@
 #include "pipe/p_context.h"
 #include "state_tracker/st_context.h"
 #include "state_tracker/st_public.h"
-#include "stw_winsys.h"
-#include "stw_device.h"
-#include "stw_framebuffer.h"
+#include "shared/stw_winsys.h"
+#include "shared/stw_device.h"
+#include "shared/stw_framebuffer.h"
 #include "stw_wgl.h"
 
 WINGDIAPI BOOL APIENTRY