diff --git a/lib/DataTypes.ml b/lib/DataTypes.ml
index ddafc1fe..6faf755d 100644
--- a/lib/DataTypes.ml
+++ b/lib/DataTypes.ml
@@ -1282,6 +1282,10 @@ let remove_empty_structs files =
         LidSet.empty
   end)#visit_files () files in
 
+  let files = List.map (fun (f, decls) ->
+    f, List.filter (fun d -> not (LidSet.mem (lid_of_decl d) empty_structs)) decls
+  ) files in
+
   (object
 
     inherit [_] map as super