.

bigfile/_bigfile.h

@@ -46,10 +46,10 @@ extern "C" {
  *      .pyuser                 generic python-level attribute (see below).
  */
 struct PyVMA {
-    PyObject;
+    PyObject pyobj;
     PyObject *in_weakreflist;
 
-    VMA;
+    VMA vma;
 
     /* python-level user of this VMA.
      *
@@ -77,10 +77,10 @@ typedef struct PyVMA PyVMA;
  *      .isdirty()              for knowing are there any changes at all
  */
 struct PyBigFileH {
-    PyObject;
+    PyObject pyobj;
     PyObject *in_weakreflist;
 
-    BigFileH;
+    BigFileH fileh;
 
     /* if subclass, in addition to .loadblk/.storeblk, defines .mmapper XXX ... */
     PyObject *pymmapper; // python object returned by .mmaper() that is holding virtmem_mapper pycapsule
@@ -96,11 +96,11 @@ typedef struct PyBigFileH PyBigFileH;
  * For users .fileh_open() is exposed to get to file handles.
  */
 struct PyBigFile {
-    PyObject;
+    PyObject pyobj;
     /* NOTE no explicit weakref support is needed - this is a base class and python
      * automatically adds support for weakrefs for in-python defined children   */
 
-    BigFile;
+    BigFile file;
 };
 typedef struct PyBigFile PyBigFile;
 

bigfile/file_zodb.cpp

@@ -20,6 +20,7 @@
 #include "wcfs/internal/wcfs.h"
 #include "wendelin/bigfile/file.h"
 #include "wendelin/bigfile/virtmem.h"
+#include "bigfile/_bigfile.h"
 #include "bigfile/_file_zodb.h"
 
 void* virt_mmap_setup_read(VMA *vma, BigFile *file, blk_t blk, size_t blklen) {