[akhaldi] 61329: [WINED3D] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716

Author: akhaldi
Date: Sat Dec 21 19:11:16 2013
New Revision: 61329

URL: http://svn.reactos.org/svn/reactos?rev=61329&view=rev
Log:
[WINED3D]
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

Modified:
    trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c
    trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c
    trunk/reactos/dll/directx/wine/wined3d/buffer.c
    trunk/reactos/dll/directx/wine/wined3d/context.c
    trunk/reactos/dll/directx/wine/wined3d/device.c
    trunk/reactos/dll/directx/wine/wined3d/directx.c
    trunk/reactos/dll/directx/wine/wined3d/drawprim.c
    trunk/reactos/dll/directx/wine/wined3d/gl_compat.c
    trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c
    trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c
    trunk/reactos/dll/directx/wine/wined3d/palette.c
    trunk/reactos/dll/directx/wine/wined3d/query.c
    trunk/reactos/dll/directx/wine/wined3d/resource.c
    trunk/reactos/dll/directx/wine/wined3d/sampler.c
    trunk/reactos/dll/directx/wine/wined3d/shader.c
    trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c
    trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c
    trunk/reactos/dll/directx/wine/wined3d/state.c
    trunk/reactos/dll/directx/wine/wined3d/stateblock.c
    trunk/reactos/dll/directx/wine/wined3d/surface.c
    trunk/reactos/dll/directx/wine/wined3d/swapchain.c
    trunk/reactos/dll/directx/wine/wined3d/texture.c
    trunk/reactos/dll/directx/wine/wined3d/utils.c
    trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c
    trunk/reactos/dll/directx/wine/wined3d/view.c
    trunk/reactos/dll/directx/wine/wined3d/volume.c
    trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c
    trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h

Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c	[iso-8859-1] Sat Dec 21
19:11:16 2013
@@ -26,12 +26,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <config.h>
-#include <wine/port.h>
-
-//#include <math.h>
-#include <stdio.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c	[iso-8859-1] Sat Dec 21
19:11:16 2013
@@ -17,12 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <config.h>
-#include <wine/port.h>
-
-//#include <math.h>
-//#include <stdio.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/buffer.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/buffer.c	[iso-8859-1] Sat Dec 21 19:11:16 2013
@@ -21,9 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include <config.h>
-#include <wine/port.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/context.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/context.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/context.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -18,14 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <config.h>
-#include <wine/port.h>
-
-//#include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/device.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/device.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/device.c	[iso-8859-1] Sat Dec 21 19:11:16 2013
@@ -24,14 +24,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
-
-//#include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
-
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/directx.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/directx.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -21,13 +21,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
-
-#include <stdio.h>
-
 #include "wined3d_private.h"
-//#include "winternl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);

Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/drawprim.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/drawprim.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -24,9 +24,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
-
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw);

Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/gl_compat.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/gl_compat.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -17,14 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <config.h>
-#include <wine/port.h>
-
-#include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -28,12 +28,6 @@
  * Ie, to generate a proper GLSL source swizzle, we need to take the D3D write
  * mask for the destination parameter into account.
  */
-
-#include <config.h>
-#include <wine/port.h>
-
-//#include <limits.h>
-#include <stdio.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c	[iso-8859-1]
(original)
+++ trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c	[iso-8859-1] Sat Dec 21
19:11:16 2013
@@ -19,11 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include <config.h>
-#include <wine/port.h>
-
-//#include <math.h>
-//#include <stdio.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/palette.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/palette.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -18,12 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include <config.h>
-#include <wine/port.h>
-//#include "winerror.h"
-//#include "wine/debug.h"
-
-//#include <string.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/query.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/query.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/query.c	[iso-8859-1] Sat Dec 21 19:11:16 2013
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
-#include <config.h>
-#include <wine/port.h>
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/resource.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/resource.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/sampler.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/sampler.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/sampler.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include <config.h>
-#include <wine/port.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/shader.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/shader.c	[iso-8859-1] Sat Dec 21 19:11:16 2013
@@ -21,13 +21,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <config.h>
-#include <wine/port.h>
-
-//#include <math.h>
-#include <stdio.h>
-//#include <string.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -21,9 +21,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <config.h>
-#include <wine/port.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -15,9 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <config.h>
-#include <wine/port.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/state.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/state.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/state.c	[iso-8859-1] Sat Dec 21 19:11:16 2013
@@ -24,14 +24,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <config.h>
-#include <wine/port.h>
-
-//#include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/stateblock.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/stateblock.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/surface.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/surface.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -26,8 +26,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);

Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/swapchain.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/swapchain.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/texture.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/texture.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture);

Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/utils.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/utils.c	[iso-8859-1] Sat Dec 21 19:11:16 2013
@@ -23,9 +23,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <config.h>
-#include <wine/port.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c	[iso-8859-1] Sat Dec 21
19:11:16 2013
@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl);

Modified: trunk/reactos/dll/directx/wine/wined3d/view.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/view.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/view.c	[iso-8859-1] Sat Dec 21 19:11:16 2013
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include <config.h>
-#include <wine/port.h>
 
 #include "wined3d_private.h"
 

Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/volume.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/volume.c	[iso-8859-1] Sat Dec 21 19:11:16 2013
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);

Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c	[iso-8859-1] Sat Dec 21 19:11:16
2013
@@ -22,10 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
-
-//#include "initguid.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h	[iso-8859-1] Sat Dec 21
19:11:16 2013
@@ -25,6 +25,9 @@
 #ifndef __WINE_WINED3D_PRIVATE_H
 #define __WINE_WINED3D_PRIVATE_H
 
+#include <config.h>
+#include <wine/port.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
@@ -35,14 +38,18 @@
 #define WINE_GLAPI
 #endif
 
+#ifdef HAVE_FLOAT_H
+# include <float.h>
+#endif
+
 #include <stdarg.h>
+#include <stdio.h>
 #include <math.h>
-//#include <limits.h>
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #define COBJMACROS
 #include <windef.h>
-//#include "winbase.h"
+#include <winbase.h>
 #include <winreg.h>
 #include <wingdi.h>
 #include <winuser.h>