diff --git a/src/gallium/state_trackers/d3d1x/Makefile.inc b/src/gallium/state_trackers/d3d1x/Makefile.inc
index 303915d..c27a3ca 100644
--- a/src/gallium/state_trackers/d3d1x/Makefile.inc
+++ b/src/gallium/state_trackers/d3d1x/Makefile.inc
@@ -5,7 +5,7 @@ IDL=$(wildcard *.idl include/*.idl)
 IDL_H=$(IDL:.idl=.h)
 LD=$(CXX) $(CXXFLAGS)
 
-include ../../../Makefile.template
+#include ../../../Makefile.template
 
 idl: $(IDL_H)
 
diff --git a/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile b/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
index f132518..41506c8 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
+++ b/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
@@ -6,6 +6,7 @@ PROGS_DEPS=libd3d1xshader.a
 LIBS=$(PROGS_DEPS)
 
 include ../Makefile.inc
+include ../../../Makefile.template
 
 include/sm4.h: include/sm4_defs.h
 
diff --git a/src/gallium/state_trackers/d3d1x/d3d1xshader/src/dxbc_parse.cpp b/src/gallium/state_trackers/d3d1x/d3d1xshader/src/dxbc_parse.cpp
index 05d10c1..b8b9888 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xshader/src/dxbc_parse.cpp
+++ b/src/gallium/state_trackers/d3d1x/d3d1xshader/src/dxbc_parse.cpp
@@ -24,6 +24,9 @@
  *
  **************************************************************************/
 
+//hack to prevent timedef redefinition problems
+#define USE_WS_PREFIX
+
 #include <memory>
 #include "dxbc.h"
 #include <d3d11shader.h>
diff --git a/src/gallium/state_trackers/d3d1x/d3d1xstutil/Makefile b/src/gallium/state_trackers/d3d1x/d3d1xstutil/Makefile
index f986f8e..afeea8b 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xstutil/Makefile
+++ b/src/gallium/state_trackers/d3d1x/d3d1xstutil/Makefile
@@ -3,3 +3,4 @@ CPP_SOURCES=$(wildcard src/*.cpp)
 LIBRARY_INCLUDES=-Iinclude -I../gd3dapi -I../d3dapi -I../w32api -I../../../include -I../../../auxiliary
 
 include ../Makefile.inc
+include ../../../Makefile.template
diff --git a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
index 1e96066..bd89087 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
+++ b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
@@ -246,7 +246,7 @@ struct com_traits<IUnknown>
 	static inline bool is_self_or_ancestor(REFIID riid) {return riid == iid();}
 };
 
-#ifndef _MSC_VER
+#ifndef __uuidof
 #define __uuidof(T) (com_traits<T>::iid())
 #endif
 
diff --git a/src/gallium/state_trackers/d3d1x/d3dapi/Makefile b/src/gallium/state_trackers/d3d1x/d3dapi/Makefile
index 8b16b1b..1a175ab 100644
--- a/src/gallium/state_trackers/d3d1x/d3dapi/Makefile
+++ b/src/gallium/state_trackers/d3d1x/d3dapi/Makefile
@@ -1,4 +1,4 @@
-all: idl
+default: idl
 
 include ../Makefile.inc
 
diff --git a/src/gallium/state_trackers/d3d1x/d3dapi/d3d10_1.idl b/src/gallium/state_trackers/d3d1x/d3dapi/d3d10_1.idl
index 7edeff9..0d3c521 100644
--- a/src/gallium/state_trackers/d3d1x/d3dapi/d3d10_1.idl
+++ b/src/gallium/state_trackers/d3d1x/d3dapi/d3d10_1.idl
@@ -178,7 +178,7 @@ typedef HRESULT (* PFN_D3D10_CREATE_DEVICE_AND_SWAP_CHAIN1)(
 	[out,optional] ID3D10Device1**
 );
 
-HRESULT D3D10CreateDeviceAndSwapChain1(
+HRESULT __stdcall D3D10CreateDeviceAndSwapChain1(
 	[in,optional] IDXGIAdapter* a,
 	[in] D3D10_DRIVER_TYPE b,
 	[in] HMODULE c,
diff --git a/src/gallium/state_trackers/d3d1x/d3dapi/d3d10shader.idl b/src/gallium/state_trackers/d3d1x/d3dapi/d3d10shader.idl
index 6088a88..a144386 100644
--- a/src/gallium/state_trackers/d3d1x/d3dapi/d3d10shader.idl
+++ b/src/gallium/state_trackers/d3d1x/d3dapi/d3d10shader.idl
@@ -71,8 +71,11 @@ typedef D3D10_CBUFFER_TYPE* LPD3D10_CBUFFER_TYPE;
 typedef D3D_NAME D3D10_NAME;
 typedef D3D_RESOURCE_RETURN_TYPE D3D10_RESOURCE_RETURN_TYPE;
 typedef D3D_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_TYPE;
+
 typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE;
-typedef ID3DInclude* LPD3D10INCLUDE;
+typedef ID3DInclude ID3D10Include;
+typedef ID3DInclude *LPD3D10INCLUDE;
+#define IID_ID3D10Include IID_ID3DInclude
 
 cpp_quote("#define D3D10_SHVER_GET_TYPE(v) (((v) >> 16) & 0xffff)")
 cpp_quote("#define D3D10_SHVER_GET_MAJOR(v) (((v) >> 4) & 0xf)")
@@ -257,9 +260,9 @@ interface ID3D10ShaderReflection : IUnknown
 HRESULT D3D10CompileShader(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, const D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, 
 	LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs);
 HRESULT D3D10DisassembleShader(const void *pShader, SIZE_T BytecodeLength, BOOL EnableColorCode, LPCSTR pComments, ID3D10Blob** ppDisassembly);
-LPCSTR D3D10GetPixelShaderProfile(ID3D10Device *pDevice);
-LPCSTR D3D10GetVertexShaderProfile(ID3D10Device *pDevice);
-LPCSTR D3D10GetGeometryShaderProfile(ID3D10Device *pDevice);
+LPCSTR __stdcall D3D10GetPixelShaderProfile(ID3D10Device *pDevice);
+LPCSTR __stdcall D3D10GetVertexShaderProfile(ID3D10Device *pDevice);
+LPCSTR __stdcall D3D10GetGeometryShaderProfile(ID3D10Device *pDevice);
 HRESULT D3D10ReflectShader(const void *pShaderBytecode, SIZE_T BytecodeLength, ID3D10ShaderReflection **ppReflector);
 HRESULT D3D10PreprocessShader(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, const D3D10_SHADER_MACRO* pDefines, 
 	LPD3D10INCLUDE pInclude, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
diff --git a/src/gallium/state_trackers/d3d1x/d3dapi/d3d11.idl b/src/gallium/state_trackers/d3d1x/d3dapi/d3d11.idl
index cac046f..4dfedbf 100644
--- a/src/gallium/state_trackers/d3d1x/d3dapi/d3d11.idl
+++ b/src/gallium/state_trackers/d3d1x/d3dapi/d3d11.idl
@@ -2476,7 +2476,7 @@ typedef HRESULT (* PFN_D3D11_CREATE_DEVICE_AND_SWAP_CHAIN)(
 	[out,optional] ID3D11DeviceContext**
 );
 
-HRESULT D3D11CreateDeviceAndSwapChain(
+HRESULT __stdcall D3D11CreateDeviceAndSwapChain(
 	[in,optional] IDXGIAdapter* a,
 	[in] D3D_DRIVER_TYPE b,
 	[in] HMODULE c,
diff --git a/src/gallium/state_trackers/d3d1x/d3dapi/dxgi.idl b/src/gallium/state_trackers/d3d1x/d3dapi/dxgi.idl
index 86ef261..c419df4 100644
--- a/src/gallium/state_trackers/d3d1x/d3dapi/dxgi.idl
+++ b/src/gallium/state_trackers/d3d1x/d3dapi/dxgi.idl
@@ -331,7 +331,7 @@ interface IDXGIFactory : IDXGIObject
 	);
 }
 
-[local] HRESULT CreateDXGIFactory(REFIID riid, void **factory);
+[local] HRESULT __stdcall CreateDXGIFactory(REFIID riid, void **factory);
 
 [
 	object,
@@ -467,4 +467,4 @@ interface IDXGIFactory1 : IDXGIFactory
 	BOOL IsCurrent();
 };
 
-[local] HRESULT CreateDXGIFactory1(REFIID riid, void **factory);
+[local] HRESULT __stdcall CreateDXGIFactory1(REFIID riid, void **factory);
diff --git a/src/gallium/state_trackers/d3d1x/docs/Makefile b/src/gallium/state_trackers/d3d1x/docs/Makefile
index 7f38fa7..17ee219 100644
--- a/src/gallium/state_trackers/d3d1x/docs/Makefile
+++ b/src/gallium/state_trackers/d3d1x/docs/Makefile
@@ -1,4 +1,4 @@
-all: module_dependencies.svg module_dependencies.pdf
+default: module_dependencies.svg module_dependencies.pdf
 .IGNORE: module_dependencies.svg module_dependencies.pdf
 
 include ../Makefile.inc
diff --git a/src/gallium/state_trackers/d3d1x/dxgi/Makefile b/src/gallium/state_trackers/d3d1x/dxgi/Makefile
index 6cdc33b..9903dbd 100644
--- a/src/gallium/state_trackers/d3d1x/dxgi/Makefile
+++ b/src/gallium/state_trackers/d3d1x/dxgi/Makefile
@@ -4,6 +4,7 @@ LIBRARY_DEFINES=-DDXGI_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\"
 CPP_SOURCES=$(wildcard src/*.cpp)
 
 include ../Makefile.inc
+include ../../../Makefile.template
 
 ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
 LIBRARY_DEFINES += -DGALLIUM_DXGI_USE_X11
diff --git a/src/gallium/state_trackers/d3d1x/dxgid3d10/Makefile b/src/gallium/state_trackers/d3d1x/dxgid3d10/Makefile
index 85f41e8..f994a7b 100644
--- a/src/gallium/state_trackers/d3d1x/dxgid3d10/Makefile
+++ b/src/gallium/state_trackers/d3d1x/dxgid3d10/Makefile
@@ -2,3 +2,4 @@ LIBNAME=dxgid3d10
 CPP_SOURCES=$(wildcard *.cpp)
 LIBRARY_INCLUDES=-I../gd3dapi -I../d3dapi -I../w32api -I../d3d1xstutil/include -I../include -I../../../include -I../../../auxiliary
 include ../Makefile.inc
+include ../../../Makefile.template
diff --git a/src/gallium/state_trackers/d3d1x/dxgid3d11/Makefile b/src/gallium/state_trackers/d3d1x/dxgid3d11/Makefile
index 591d1be..ff33d27 100644
--- a/src/gallium/state_trackers/d3d1x/dxgid3d11/Makefile
+++ b/src/gallium/state_trackers/d3d1x/dxgid3d11/Makefile
@@ -2,3 +2,4 @@ LIBNAME=dxgid3d11
 CPP_SOURCES=$(wildcard *.cpp)
 LIBRARY_INCLUDES=-I../gd3dapi -I../d3dapi -I../w32api -I../d3d1xstutil/include -I../include -I../../../include -I../../../auxiliary
 include ../Makefile.inc
+include ../../../Makefile.template
diff --git a/src/gallium/state_trackers/d3d1x/gd3d10/Makefile b/src/gallium/state_trackers/d3d1x/gd3d10/Makefile
index 300149d..cb7cb23 100644
--- a/src/gallium/state_trackers/d3d1x/gd3d10/Makefile
+++ b/src/gallium/state_trackers/d3d1x/gd3d10/Makefile
@@ -5,6 +5,7 @@ LIBRARY_INCLUDES=-I../gd3d1x -I../gd3dapi -I../d3dapi -I../w32api -I../d3d1xstut
 GEN_D3D10=perl d3d10.pl
 
 include ../Makefile.inc
+include ../../../Makefile.template
 
 d3d10.generated.o: d3d10_objects.generated.h d3d10_screen.generated.h d3d10_context.generated.h d3d10_misc.generated.h
  
diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/Makefile b/src/gallium/state_trackers/d3d1x/gd3d11/Makefile
index 650c11d..899c8f6 100644
--- a/src/gallium/state_trackers/d3d1x/gd3d11/Makefile
+++ b/src/gallium/state_trackers/d3d1x/gd3d11/Makefile
@@ -3,4 +3,4 @@ CPP_SOURCES=d3d11.cpp
 LIBRARY_INCLUDES=-I../gd3d1x -I../gd3dapi -I../d3dapi -I../w32api -I../d3d1xstutil/include -I../d3d1xshader/include -I../../../include -I../../../auxiliary -I../../../state_trackers/egl/common
 
 include ../Makefile.inc
-
+include ../../../Makefile.template
diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h
index a7b761c..5d4968a 100644
--- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h
+++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h
@@ -1388,7 +1388,7 @@ struct GalliumD3D10Device : public GalliumD3D10ScreenImpl<threadsafe>
 			return E_NOTIMPL;
 
 		GalliumD3D11Asynchronous<>* async = (GalliumD3D11Asynchronous<>*)iasync;
-		void* tmp_data = alloca(async->data_size);
+		pipe_query_result* tmp_data = (pipe_query_result*)alloca(async->data_size);
 		memset(tmp_data, 0, async->data_size); // sizeof(BOOL) is 4, sizeof(boolean) is 1
 		boolean ret = pipe->get_query_result(pipe, async->query, !(get_data_flags & D3D11_ASYNC_GETDATA_DONOTFLUSH), tmp_data);
 		if(out_data)
@@ -1499,7 +1499,7 @@ struct GalliumD3D10Device : public GalliumD3D10ScreenImpl<threadsafe>
 		else if(map_type == D3D11_MAP_READ_WRITE)
 			usage = PIPE_TRANSFER_READ_WRITE;
 		else if(map_type == D3D11_MAP_WRITE_DISCARD)
-			usage = PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD;
+			usage = PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE;
 		else if(map_type == D3D11_MAP_WRITE_NO_OVERWRITE)
 			usage = PIPE_TRANSFER_WRITE | PIPE_TRANSFER_UNSYNCHRONIZED;
 		else
diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h
index 31e59bf..69a7e51 100644
--- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h
+++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h
@@ -71,7 +71,7 @@ static unsigned caps_dx_10_0[] = {
 	UTIL_CHECK_CAP(INDEP_BLEND_ENABLE),
 	UTIL_CHECK_CAP(ANISOTROPIC_FILTER),
 	UTIL_CHECK_CAP(MIXED_COLORBUFFER_FORMATS),
-	UTIL_CHECK_CAP(FRAGMENT_COLOR_CLAMP_CONTROL),
+	UTIL_CHECK_CAP(FRAGMENT_COLOR_CLAMPED),
 	UTIL_CHECK_CAP(CONDITIONAL_RENDER),
 	UTIL_CHECK_CAP(PRIMITIVE_RESTART),
 	UTIL_CHECK_CAP(TGSI_INSTANCEID),
@@ -847,7 +847,7 @@ struct GalliumD3D11ScreenImpl : public GalliumD3D11Screen
 					box.width = u_minify(width, level);
 					box.height = u_minify(height, level);
 					box.depth = u_minify(depth, level);
-					immediate_pipe->transfer_inline_write(immediate_pipe, resource, level, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD | PIPE_TRANSFER_UNSYNCHRONIZED, &box, initial_data->pSysMem, initial_data->SysMemPitch, initial_data->SysMemSlicePitch);
+					immediate_pipe->transfer_inline_write(immediate_pipe, resource, level, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE | PIPE_TRANSFER_UNSYNCHRONIZED, &box, initial_data->pSysMem, initial_data->SysMemPitch, initial_data->SysMemSlicePitch);
 					++initial_data;
 				}
 			}
@@ -1519,11 +1519,13 @@ struct GalliumD3D11ScreenImpl : public GalliumD3D11Screen
 
 #if API >= 11
 		if(num_strides)
-			so.stride = buffer_strides[0];
+			//TODO: what is suposed to happen here? is this right?
+			so.stride[0] = buffer_strides[0];
 		if(num_strides > 1)
 			debug_printf("Warning: multiple user-specified strides not implemented !\n");
 #else
-		so.stride = output_stream_stride;
+		//TODO: what is suposed to happen here? is this right?
+		so.stride[0] = output_stream_stride;
 #endif
 
 		for(unsigned i = 0; i < num_entries; ++i)
@@ -1534,10 +1536,9 @@ struct GalliumD3D11ScreenImpl : public GalliumD3D11Screen
 					break;
 			if(j >= num_outputs)
 				continue;
-			const int first_comp = ffs(out[j].Mask) - 1 + so_declaration[i].StartComponent;
 			so.output[i].output_buffer = so_declaration[i].OutputSlot;
 			so.output[i].register_index = out[j].Register;
-			so.output[i].register_mask = ((1 << so_declaration[i].ComponentCount) - 1) << first_comp;
+			so.output[i].num_components = so_declaration[i].ComponentCount;
 			++so.num_outputs;
 		}
 		if(out)
diff --git a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
index 32d2956..7273629 100644
--- a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
+++ b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
@@ -5,3 +5,4 @@ PROGS=tools/dxbc2tgsi
 PROGS_DEPS=libgd3d1x.a ../d3d1xshader/libd3d1xshader.a ../d3d1xstutil/libd3d1xstutil.a ../../../auxiliary/libgallium.a
 LIBS=$(PROGS_DEPS) -ldl
 include ../Makefile.inc
+include ../../../Makefile.template
diff --git a/src/gallium/state_trackers/d3d1x/gd3d1x/sm4_to_tgsi.cpp b/src/gallium/state_trackers/d3d1x/gd3d1x/sm4_to_tgsi.cpp
index aaa46f1..960f5be 100644
--- a/src/gallium/state_trackers/d3d1x/gd3d1x/sm4_to_tgsi.cpp
+++ b/src/gallium/state_trackers/d3d1x/gd3d1x/sm4_to_tgsi.cpp
@@ -450,10 +450,10 @@ struct sm4_to_tgsi_converter
 				break;
 			// TODO: sample index, texture offset
 			case SM4_OPCODE_LD: // dst, coord_int, res; mipmap level in last coord_int arg
-				ureg_LOAD(ureg, _dst(), _src(1), resources[_idx(SM4_FILE_RESOURCE, 2)]);
+				ureg_SAMPLE_I(ureg, _dst(), _src(1), resources[_idx(SM4_FILE_RESOURCE, 2)]);
 				break;
 			case SM4_OPCODE_LD_MS:
-				ureg_LOAD_MS(ureg, _dst(), _src(1), resources[_idx(SM4_FILE_RESOURCE, 2)]);
+				ureg_SAMPLE_I_MS(ureg, _dst(), _src(1), resources[_idx(SM4_FILE_RESOURCE, 2)]);
 				break;
 			case SM4_OPCODE_SAMPLE: // dst, coord, res, samp
 				ureg_SAMPLE(ureg, _dst(), _src(1), resources[_idx(SM4_FILE_RESOURCE, 2)], samplers[_idx(SM4_FILE_SAMPLER, 3)]);
diff --git a/src/gallium/state_trackers/d3d1x/gd3dapi/Makefile b/src/gallium/state_trackers/d3d1x/gd3dapi/Makefile
index 8b16b1b..1a175ab 100644
--- a/src/gallium/state_trackers/d3d1x/gd3dapi/Makefile
+++ b/src/gallium/state_trackers/d3d1x/gd3dapi/Makefile
@@ -1,4 +1,4 @@
-all: idl
+default: idl
 
 include ../Makefile.inc
 
diff --git a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl
index dddb343..079866b 100644
--- a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl
+++ b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d10_1.idl
@@ -32,4 +32,4 @@ import "d3d10_1.idl";
 interface IDummyInterfaceToPutWidlInComModeForGalliumD3D10
 {}
 
-HRESULT GalliumD3D10DeviceCreate1(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned creation_flags, IDXGIAdapter* adapter, ID3D10Device1** ppDevice);
+HRESULT __stdcall GalliumD3D10DeviceCreate1(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned int creation_flags, IDXGIAdapter* adapter, ID3D10Device1** ppDevice);
diff --git a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d11.idl b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d11.idl
index 76f8a7f..de6830e 100644
--- a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d11.idl
+++ b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumd3d11.idl
@@ -32,5 +32,5 @@ import "d3d11.idl";
 interface IDummyInterfaceToPutWidlInComModeForGalliumD3D11
 {}
 
-HRESULT GalliumD3D11DeviceCreate(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned creation_flags, IDXGIAdapter* adapter, ID3D11Device** ppDevice);
+HRESULT __stdcall GalliumD3D11DeviceCreate(struct pipe_screen* screen, struct pipe_context* context, BOOL owns_context, unsigned int creation_flags, IDXGIAdapter* adapter, ID3D11Device** ppDevice);
 
diff --git a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumdxgi.idl b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumdxgi.idl
index c6233c8..24ea566 100644
--- a/src/gallium/state_trackers/d3d1x/gd3dapi/galliumdxgi.idl
+++ b/src/gallium/state_trackers/d3d1x/gd3dapi/galliumdxgi.idl
@@ -119,10 +119,10 @@ interface IGalliumDXGIBackend : IUnknown
 	);
 }
 
-void GalliumDXGIUseNothing();
+void __stdcall GalliumDXGIUseNothing();
 
 /* only a subset of these may be available, depending on platform and compilation options */
-void GalliumDXGIUseX11Display(struct _XDisplay* dpy, IGalliumDXGIBackend* backend);
+void __stdcall GalliumDXGIUseX11Display(struct _XDisplay* dpy, IGalliumDXGIBackend* backend);
 
 /* these don't really work for now
 void GalliumDXGIUseDRMCard(int fd);
@@ -130,5 +130,5 @@ void GalliumDXGIUseFBDev(int fd);
 void GalliumDXGIUseHDC(HDC hdc, IGalliumDXGIGDIBackend* backend);
 */
 
-void GalliumDXGIMakeDefault();
+void __stdcall GalliumDXGIMakeDefault();
 
diff --git a/src/gallium/state_trackers/d3d1x/progs/Makefile b/src/gallium/state_trackers/d3d1x/progs/Makefile
index 143e531..73c87fd 100644
--- a/src/gallium/state_trackers/d3d1x/progs/Makefile
+++ b/src/gallium/state_trackers/d3d1x/progs/Makefile
@@ -13,8 +13,9 @@ LIBS= \
 
 LDADD=-ldl
 
-all: bin/d3d10tri bin/d3d11tri bin/d3d11tex bin/d3d11gears
+default: bin/d3d10tri bin/d3d11tri bin/d3d11tex bin/d3d11gears
 include ../Makefile.inc
+include ../../../Makefile.template
 
 ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),)
 LIBS += ../../../winsys/sw/fbdev/libfbdev.a
diff --git a/src/gallium/state_trackers/d3d1x/winedlls/Makefile b/src/gallium/state_trackers/d3d1x/winedlls/Makefile
index c7e51b2..d74b796 100644
--- a/src/gallium/state_trackers/d3d1x/winedlls/Makefile
+++ b/src/gallium/state_trackers/d3d1x/winedlls/Makefile
@@ -1,6 +1,6 @@
 SUBDIRS=dxgi d3d10 d3d10_1 d3d11
 
-all:
+default:
 	@for dir in $(SUBDIRS) ; do $(MAKE) -C "$$dir" || exit $?; done
 
 clean:
diff --git a/src/gallium/state_trackers/d3d1x/winedlls/Makefile.wine b/src/gallium/state_trackers/d3d1x/winedlls/Makefile.wine
index 31f9737..f7b2412 100644
--- a/src/gallium/state_trackers/d3d1x/winedlls/Makefile.wine
+++ b/src/gallium/state_trackers/d3d1x/winedlls/Makefile.wine
@@ -15,9 +15,9 @@ lib%.def: %.spec
 	winebuild -w --def -o $@ --export $<
 
 lib%.cross.a: %.spec
-	winebuild -m32  -b i586-mingw32msvc -w --implib -o $@ --export $<
+	winebuild -m32  -b i486-mingw32 -w --implib -o $@ --export $<
 
 version.res: version.rc
 	wrc --nostdinc -I. -I. -I../../include -I../../include  -D__WINESRC__   -fo$@ $^
 
-include ../../../../Makefile.template
+#include ../../../../Makefile.template