Additional info:
after my patches amstream fails to link complaining about duplicate IID_IResourceManager:
~/wine-git/dlls/amstream$ make
../../tools/winegcc/winegcc -m32 -B../../tools/winebuild --sysroot=../.. -fasynchronous-unwind-tables -shared ./amstream.spec amstream.o audiodata.o main.o mediastream.o mediastreamfilter.o amstream_classes_r.res version.res -o amstream.dll.so -lstrmiids -lstrmbase -luuid -lole32 -ladvapi32 ../../libs/port/libwine_port.a
../../dlls/uuid/libuuid.a(uuid.o):(.rodata+0x540): multiple definition of `IID_IResourceManager'
../../dlls/strmiids/libstrmiids.a(strmiids.o):(.rodata+0x5e0): first defined here
winebuild: /usr/bin/ld failed with status 1
winegcc: ../../tools/winebuild/winebuild failed
if I don't add the DTC headers to uuid, linking xolehlp fails:
~/wine-git/dlls/xolehlp$ make
../../tools/winegcc/winegcc -m32 -B../../tools/winebuild --sysroot=../.. -fasynchronous-unwind-tables -shared ./xolehlp.spec xolehlp.o -o xolehlp.dll.so -luuid ../../libs/port/libwine_port.a
xolehlp.o: In function `TransactionDispenser_QueryInterface':
/home/daniel/wine-git/dlls/xolehlp/xolehlp.c:170: undefined reference to `IID_ITransactionDispenser'
/usr/bin/ld: xolehlp.o: relocation R_386_GOTOFF against undefined hidden symbol `IID_ITransactionDispenser' can not be used when making a shared object
/usr/bin/ld: final link failed: Bad value