--- fpicker/source/win32/folderpicker/MtaFop.hxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/folderpicker/MtaFop.hxx	2008-10-31 17:44:49.000000000 +0100
@@ -48,7 +48,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 
 //----------------------------------------------------------------
 // a simple helper class used to provide a buffer for different
--- fpicker/source/win32/folderpicker/makefile.mk.pristine	2008-10-31 17:41:41.000000000 +0100
+++ fpicker/source/win32/folderpicker/makefile.mk	2008-10-31 17:44:49.000000000 +0100
@@ -45,9 +45,9 @@ COMP1TYPELIST=$(TARGET)
 # enable rtti
 CFLAGS+=-GR
 
-SLOFILES=$(SLO)$/fopentry.obj\
-		 $(SLO)$/folderpicker.obj\
-		 $(SLO)$/WinFopImpl.obj\
+SLOFILES=$(SLO)$/Fopentry.obj\
+		 $(SLO)$/FolderPicker.obj\
+		 $(SLO)$/WinFOPImpl.obj\
 		 $(SLO)$/MtaFop.obj
 
 # --- Targets ------------------------------------------------------
--- fpicker/source/win32/folderpicker/Fopentry.cxx.pristine	2008-10-31 17:41:41.000000000 +0100
+++ fpicker/source/win32/folderpicker/Fopentry.cxx	2008-10-31 17:44:49.000000000 +0100
@@ -39,7 +39,7 @@
 #include <osl/diagnose.h>
 
 #ifndef _FILEPICKER_HXX_
-#include "folderpicker.hxx"
+#include "FolderPicker.hxx"
 #endif
 
 #ifndef _FPSERVICEINFO_HXX_
--- fpicker/source/win32/folderpicker/workbench/Test_fops.cxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/folderpicker/workbench/Test_fops.cxx	2008-10-31 17:44:49.000000000 +0100
@@ -62,7 +62,7 @@
 #include <stdio.h>
 
 #ifndef _FPSERVICEINFO_HXX_
-#include "..\FOPServiceInfo.hxx"
+#include "../FOPServiceInfo.hxx"
 #endif
 
 #include <osl/file.hxx>
--- fpicker/source/win32/folderpicker/FolderPicker.cxx.pristine	2008-10-31 17:41:41.000000000 +0100
+++ fpicker/source/win32/folderpicker/FolderPicker.cxx	2008-10-31 17:44:49.000000000 +0100
@@ -37,7 +37,7 @@
 #include <osl/diagnose.h>
 
 #ifndef _FOLDERPICKER_HXX_
-#include "folderpicker.hxx"
+#include "FolderPicker.hxx"
 #endif
 #include <com/sun/star/lang/DisposedException.hpp>
 #include "WinFOPImpl.hxx"
--- fpicker/source/win32/folderpicker/MtaFop.cxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/folderpicker/MtaFop.cxx	2008-10-31 17:44:49.000000000 +0100
@@ -36,7 +36,7 @@
 #include "MtaFop.hxx"
 #include <wchar.h>
 #include <process.h>
-#include "..\misc\resourceprovider.hxx"
+#include "../misc/resourceprovider.hxx"
 
 #include <systools/win32/comtools.hxx>
 
--- fpicker/source/win32/filepicker/FilePicker.cxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/filepicker/FilePicker.cxx	2008-10-31 18:47:21.000000000 +0100
@@ -41,12 +41,12 @@
 #include <osl/diagnose.h>
 
 #ifndef _FILEPICKER_HXX_
-#include "filepicker.hxx"
+#include "FilePicker.hxx"
 #endif
 #include "WinFileOpenImpl.hxx"
 
 #include "FPServiceInfo.hxx"
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include "filepickereventnotification.hxx"
 
--- fpicker/source/win32/filepicker/VistaFilePicker.cxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/filepicker/VistaFilePicker.cxx	2008-10-31 17:44:49.000000000 +0100
@@ -41,7 +41,7 @@
 
 #include "VistaFilePicker.hxx"
 #include "WinFileOpenImpl.hxx"
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 #include "shared.hxx"
 
 #include <com/sun/star/lang/DisposedException.hpp>
--- fpicker/source/win32/filepicker/controlaccess.cxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/filepicker/controlaccess.cxx	2008-10-31 17:44:49.000000000 +0100
@@ -38,7 +38,7 @@
 #include <tchar.h>
 #include <osl/diagnose.h>
 #include "controlaccess.hxx"
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 
 //------------------------------------------------------------
 // we are using a table based algorithm to dispatch control 
--- fpicker/source/win32/filepicker/makefile.mk.pristine	2008-10-31 17:41:41.000000000 +0100
+++ fpicker/source/win32/filepicker/makefile.mk	2008-10-31 17:44:49.000000000 +0100
@@ -55,7 +55,7 @@ CDEFS+=-UWINVER -DWINVER=0x500
 # --- Resources ----------------------------------------------------
 
 .IF "$(GUI)" == "WNT"
-RCFILES=fps.rc
+RCFILES=Fps.rc
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -80,9 +80,14 @@ SLOFILES=$(SLO)$/FileOpenDlg.obj\
 		 $(SLO)$/customcontrolfactory.obj\
 		 $(SLO)$/dialogcustomcontrols.obj\
 		 $(SLO)$/asyncrequests.obj\
+#
+
+.IF "$(CROSS_COMPILING)" == "no"
+SLOFILES +=\
 		 $(SLO)$/VistaFilePickerEventHandler.obj\
 		 $(SLO)$/VistaFilePickerImpl.obj\
 		 $(SLO)$/VistaFilePicker.obj
+.ENDIF # "$(CROSS_COMPILING)" == "no"
 
 # --- Targets ------------------------------------------------------
 
--- fpicker/source/win32/filepicker/WinFileOpenImpl.hxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/filepicker/WinFileOpenImpl.hxx	2008-10-31 17:44:49.000000000 +0100
@@ -47,7 +47,7 @@
 #include "helppopupwindow.hxx"
 #include "customcontrol.hxx"
 #include "customcontrolfactory.hxx"
-#include "..\misc\resourceprovider.hxx"
+#include "../misc/resourceprovider.hxx"
 
 #include <utility>
 #include <memory>
--- fpicker/source/win32/filepicker/comptr.hxx.pristine	2008-10-31 17:41:41.000000000 +0100
+++ fpicker/source/win32/filepicker/comptr.hxx	2008-10-31 17:44:49.000000000 +0100
@@ -33,7 +33,9 @@
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
+#ifndef __MINGW32__
 #include <shobjidl.h>
+#endif /* __MINGW32__ */
 
 template< class    T_INTERFACE          ,
           REFIID   P_IID   = IID_NULL   ,
--- fpicker/source/win32/filepicker/WinFileOpenImpl.cxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/filepicker/WinFileOpenImpl.cxx	2008-10-31 18:47:42.000000000 +0100
@@ -44,11 +44,11 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
-#include <com/sun/star/ui/dialogs/ListBoxControlActions.hpp>
-#include "..\misc\WinImplHelper.hxx"
+#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
+#include "../misc/WinImplHelper.hxx"
 
 #ifndef _FILEPICKER_HXX_
-#include "filepicker.hxx"
+#include "FilePicker.hxx"
 #endif
 #include "controlaccess.hxx"
 #include <rtl/ustrbuf.hxx>
--- fpicker/source/win32/filepicker/workbench/Test_fps.cxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/filepicker/workbench/Test_fps.cxx	2008-10-31 17:44:49.000000000 +0100
@@ -70,7 +70,7 @@
 #include <stdio.h>
 #include <windows.h>
 
-#include "..\FPServiceInfo.hxx"
+#include "../FPServiceInfo.hxx"
 
 //
 //	namesapces
--- fpicker/source/win32/filepicker/filepickerstate.cxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/filepicker/filepickerstate.cxx	2008-10-31 18:47:58.000000000 +0100
@@ -39,7 +39,7 @@
 #include "controlaccess.hxx"
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ListBoxControlActions.hpp>
+#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include "controlcommandrequest.hxx"
 #include "controlcommandresult.hxx"
@@ -49,7 +49,7 @@
 #include "FileOpenDlg.hxx"
 
 #include <memory>
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 //---------------------------------------------
 //
 //---------------------------------------------
--- fpicker/source/win32/filepicker/getfilenamewrapper.cxx.pristine	2008-10-31 17:41:41.000000000 +0100
+++ fpicker/source/win32/filepicker/getfilenamewrapper.cxx	2008-10-31 17:44:49.000000000 +0100
@@ -48,6 +48,10 @@
 #pragma warning(pop)
 #endif
 
+#ifdef __MINGW32__
+#include <ole2.h>
+#endif /* __MINGW32__ */
+
 namespace /* private */
 {
 
--- fpicker/source/win32/filepicker/FPentry.cxx.pristine	2008-10-29 21:13:36.000000000 +0100
+++ fpicker/source/win32/filepicker/FPentry.cxx	2008-10-31 18:45:17.000000000 +0100
@@ -41,8 +41,10 @@
 #include "FPServiceInfo.hxx"
 
 #pragma warning (disable:4917)
+#ifndef __MINGW32__
 #include "VistaFilePicker.hxx"
-#include "..\misc\WinImplHelper.hxx"
+#endif /* __MINGW32__ */
+#include "../misc/WinImplHelper.hxx"
 #include <stdio.h>
 
 //-----------------------------------------------
@@ -66,6 +68,7 @@ static Reference< XInterface > SAL_CALL 
 	const Reference< XMultiServiceFactory >& rServiceManager )
 {
 	Reference< XInterface > xDlg;
+#ifndef __MINGW32__
 	bool					bVista = IsWindowsVista();
 
 	if (bVista)
@@ -76,6 +79,7 @@ static Reference< XInterface > SAL_CALL 
 				new ::fpicker::win32::vista::VistaFilePicker( rServiceManager ) ) );
 	}
 	else
+#endif /* __MINGW32__ */
 	{
         fprintf(stdout, "use normal system file picker ...\n");
 		xDlg.set( 
--- fpicker/source/win32/filepicker/vistatypes.h.pristine	2008-10-31 17:41:41.000000000 +0100
+++ fpicker/source/win32/filepicker/vistatypes.h	2008-10-31 17:44:49.000000000 +0100
@@ -36,7 +36,9 @@
 //-----------------------------------------------------------------------------
 
 #include "comptr.hxx"
+#ifndef __MINGW32__
 #include <shobjidl.h>
+#endif /* __MINGW32__ */
 
 //-----------------------------------------------------------------------------
 // namespace