diff --git a/qrenderdoc/Code/pyrenderdoc/renderdoc.i b/qrenderdoc/Code/pyrenderdoc/renderdoc.i
index 815c84d2a..1ad7ea55e 100644
--- a/qrenderdoc/Code/pyrenderdoc/renderdoc.i
+++ b/qrenderdoc/Code/pyrenderdoc/renderdoc.i
@@ -63,6 +63,19 @@
 
 %include "pyconversion.i"
 
+// typemaps for windowing data
+%typemap(in) HWND (unsigned long long tmp, int err = 0) {
+  // convert windowing data pointers from just plain integers
+  err = SWIG_AsVal_unsigned_SS_long_SS_long($input, &tmp);
+  if (!SWIG_IsOK(err)) {
+    %argument_fail(err, "$*ltype", $symname, $argnum);
+  } 
+  $1 = ($1_type)tmp;
+}
+
+%typemap(in) Display* = HWND;
+%typemap(in) xcb_connection_t* = HWND;
+
 // completely ignore rdcdatetime, we custom convert to/from a native python datetime
 %ignore rdcdatetime;
 
diff --git a/renderdoc/api/replay/renderdoc_replay.h b/renderdoc/api/replay/renderdoc_replay.h
index 0389398f6..34d92eb7a 100644
--- a/renderdoc/api/replay/renderdoc_replay.h
+++ b/renderdoc/api/replay/renderdoc_replay.h
@@ -357,7 +357,10 @@ struct ANativeWindow;
 // for swig bindings treat the windowing data struct as completely opaque
 #if defined(SWIG)
 
-struct WindowingData;
+DOCUMENT("An opaque structure created to hold windowing setup data");
+struct WindowingData
+{
+};
 
 #else