compiling wine with msvc

[James Hawkins]

I'm trying to get the wine tests to compile under msvc, so I ran
msvcmaker in the wine source under cygwin (which was successful). 
Then I opened the winetest project and did a 'rebuild all'.  When it
tries to compile advapi32_test/security.c I get an warning and 102
errors:

C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\rpc.h(89) :
warning C4005: 'RPCRTAPI' : macro redefinition
        ..\..\..\include\rpc.h(45) : see previous definition of 'RPCRTAPI'

:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\rpcnsi.h(37) :
error C2143: syntax error : missing ')' before 'type'
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\rpcnsi.h(37) :
error C2491: 'RpcNsBindingExportA' : definition of dllimport function
not allowed
......etc

I'm pretty sure the problem is that the the msvc's rpc.h and rpcnsi.h
files are being included when they shouldn't.  Is that about right? 
If so, what could be a possible solution?

BTW I'm compiling with MSVC++ 6.0. wine cvs from 11-01-2004.

-- 
James Hawkins