-Fixed an issue where winsock.h and winsock2.h were both being included in Visual C++

-Fixed a variable declaration issue.

desmume/src/windows/CWindow.h

@@ -22,6 +22,7 @@
 #ifndef CWINDOW_H
 #define CWINDOW_H
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include "../types.h"
 

desmume/src/windows/disView.c

@@ -19,7 +19,6 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <windows.h>
 #include <tchar.h>
 #include <stdio.h>
 #include "../MMU.h"

desmume/src/windows/ginfo.c

@@ -19,7 +19,6 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <windows.h>
 #include "resource.h"
 #include "../NDSSystem.h"
 #include "../MMU.h"

desmume/src/windows/main.c

@@ -23,9 +23,12 @@
 
 //#define RENDER3D
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <shellapi.h>
 #include <Winuser.h>
 #include <commctrl.h>
+#include <commdlg.h>
 #include <stdio.h>
 #include "CWindow.h"
 #include "../MMU.h"
@@ -286,9 +289,9 @@ DWORD WINAPI run( LPVOID lpParameter)
                   	StretchDIBits (hdc, 0, 0, r.right-r.left, r.bottom-r.top, 0, 0, 256, 192*2, GPU_screen, (BITMAPINFO*)&bmi, DIB_RGB_COLORS,SRCCOPY);
                   } else
                   {
+                    RECT r ;
                     GPU_rotate(&rotationbmi);
-					RECT r ;
-					GetClientRect(hwnd,&r) ;
+                    GetClientRect(hwnd,&r) ;
                     StretchDIBits(hdc, 0, 0, r.right-r.left, r.bottom-r.top, 0, 0, GPU_width, rotationscanlines, GPU_screenrotated, (BITMAPINFO*)&rotationbmi, DIB_RGB_COLORS,SRCCOPY);
                   }
                   fpsframecount++;

desmume/src/windows/mapView.h

@@ -22,7 +22,6 @@
 #ifndef MAPVIEW_H
 #define MAPVIEW_H
 
-#include <windows.h>
 #include "CWindow.h"
 
 typedef struct

desmume/src/windows/resources.rc

@@ -19,6 +19,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include "resource.h"