diff --git a/renderdoc/driver/dxgi/dxgi_wrapped.cpp b/renderdoc/driver/dxgi/dxgi_wrapped.cpp
index d0d236e5a..5425b3fc1 100644
--- a/renderdoc/driver/dxgi/dxgi_wrapped.cpp
+++ b/renderdoc/driver/dxgi/dxgi_wrapped.cpp
@@ -33,8 +33,10 @@
 
 WRAPPED_POOL_INST(WrappedIDXGIDevice);
 WRAPPED_POOL_INST(WrappedIDXGIDevice1);
+#if defined(INCLUDE_DXGI_1_2)
 WRAPPED_POOL_INST(WrappedIDXGIDevice2);
 WRAPPED_POOL_INST(WrappedIDXGIDevice3);
+#endif
 
 HRESULT WrappedIDXGIFactory::staticCreateSwapChain(IDXGIFactory *factory,
 	IUnknown *pDevice,
@@ -43,10 +45,10 @@ HRESULT WrappedIDXGIFactory::staticCreateSwapChain(IDXGIFactory *factory,
 {
 	if(WrappedID3D11Device::IsAlloc(pDevice) ||
 		WrappedIDXGIDevice::IsAlloc(pDevice) ||
-		WrappedIDXGIDevice1::IsAlloc(pDevice) ||
+		WrappedIDXGIDevice1::IsAlloc(pDevice)
 #if defined(INCLUDE_DXGI_1_2)
-		WrappedIDXGIDevice2::IsAlloc(pDevice) ||
-		WrappedIDXGIDevice3::IsAlloc(pDevice)
+		|| WrappedIDXGIDevice2::IsAlloc(pDevice)
+		|| WrappedIDXGIDevice3::IsAlloc(pDevice)
 #endif
 		)
 	{
@@ -285,7 +287,9 @@ WrappedIDXGISwapChain2::~WrappedIDXGISwapChain2()
 			wrapped->ViewRelease();
 		m_pBackBuffers[i] = NULL;
 	}
+#if defined(INCLUDE_DXGI_1_2)
 	SAFE_RELEASE(m_pReal2);
+#endif
 	SAFE_RELEASE(m_pReal);
 
 	SAFE_RELEASE(m_pDevice);
@@ -454,6 +458,7 @@ HRESULT WrappedIDXGISwapChain2::Present(
 	return m_pReal->Present(SyncInterval, Flags);
 }
 
+#if defined(INCLUDE_DXGI_1_2)
 HRESULT WrappedIDXGISwapChain2::Present1(UINT SyncInterval, UINT Flags, const DXGI_PRESENT_PARAMETERS *pPresentParameters)
 {
 	if(!RenderDoc::Inst().GetCaptureOptions().AllowVSync)
@@ -465,6 +470,7 @@ HRESULT WrappedIDXGISwapChain2::Present1(UINT SyncInterval, UINT Flags, const DX
 
 	return m_pReal2->Present1(SyncInterval, Flags, pPresentParameters);
 }
+#endif
 
 bool RefCountDXGIObject::HandleWrap(REFIID riid, void **ppvObject)
 {
diff --git a/renderdoc/os/win32/win32_shellext.cpp b/renderdoc/os/win32/win32_shellext.cpp
index e082d4c77..7675fe419 100644
--- a/renderdoc/os/win32/win32_shellext.cpp
+++ b/renderdoc/os/win32/win32_shellext.cpp
@@ -317,7 +317,7 @@ struct RDCThumbnailProviderFactory : public IClassFactory
 };
 
 _Check_return_
-STDAPI DllGetClassObject(_In_ REFCLSID rclsid, _In_ REFIID riid, _Outptr_ LPVOID* ppv)
+STDAPI DllGetClassObject(_In_ REFCLSID rclsid, _In_ REFIID riid, LPVOID* ppv)
 {
 	if(rclsid == CLSID_RDCThumbnailProvider)
 	{