visual studio .net service packs: I just upgraded the platform SDK to the new Windows SDK v6.0, and now
winnt.h is declaring things that conflict with intrin.h.

What is the correct way to include both windows.h and intrin.h?

If I put intrin.h first:
1>C:\Program Files\Microsoft SDKs\Windows\v6.0\Include\winnt.h(3112) : error
C2733: second C linkage of overloaded function '_interlockedbittestandset'
not allowed
1> C:\Program Files\Microsoft SDKs\Windows\v6.0\Include\winnt.h(3109) : see
declaration of '_interlockedbittestandset'
1>C:\Program Files\Microsoft SDKs\Windows\v6.0\Include\winnt.h(3118) : error
C2733: second C linkage of overloaded function '_interlockedbittestandreset'
not allowed
1> C:\Program Files\Microsoft SDKs\Windows\v6.0\Include\winnt.h(3115) : see
declaration of '_interlockedbittestandreset'

If I put windows.h first:
1>C:\Program Files\Microsoft SDKs\Windows\v6.0\VC\INCLUDE\intrin.h(912) :
error C2733: second C linkage of overloaded function
'_interlockedbittestandset' not allowed
1> C:\Program Files\Microsoft SDKs\Windows\v6.0\VC\INCLUDE\intrin.h(912) :
see declaration of '_interlockedbittestandset'
1>C:\Program Files\Microsoft SDKs\Windows\v6.0\VC\INCLUDE\intrin.h(913) :
error C2733: second C linkage of overloaded function
'_interlockedbittestandreset' not allowed
1> C:\Program Files\Microsoft SDKs\Windows\v6.0\VC\INCLUDE\intrin.h(913) :
see declaration of '_interlockedbittestandreset'