diff --git a/Common/DocxFormat/DocxFormatLib/xlsbformatlib_logic.cpp b/Common/DocxFormat/DocxFormatLib/xlsbformatlib_logic.cpp
index f269140119..5043fb953c 100644
--- a/Common/DocxFormat/DocxFormatLib/xlsbformatlib_logic.cpp
+++ b/Common/DocxFormat/DocxFormatLib/xlsbformatlib_logic.cpp
@@ -30,13 +30,13 @@
  *
  */
 
-// XLSB
     #include "../Source/XlsbFormat/Xlsb.cpp"
     #include "../Source/XlsbFormat/WorkBookStream.cpp"
     #include "../Source/XlsbFormat/WorkSheetStream.cpp"
     #include "../Source/XlsbFormat/SharedStringsStream.cpp"
     #include "../Source/XlsbFormat/StylesStream.cpp"
     #include "../Source/XlsbFormat/CommentsStream.cpp"
+    #include "../Source/XlsbFormat/TableStream.cpp"
 // Biff12_records
     #include "../Source/XlsbFormat/Biff12_records/BeginBook.cpp"
     #include "../Source/XlsbFormat/Biff12_records/FRTBegin.cpp"
@@ -197,6 +197,48 @@
     #include "../Source/XlsbFormat/Biff12_records/EndCommentAuthors.cpp"
     #include "../Source/XlsbFormat/Biff12_records/BeginComments.cpp"
     #include "../Source/XlsbFormat/Biff12_records/EndComments.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/TableStyleClient.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginList.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndList.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginListCols.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/ListCCFmla.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/ListTrFmla.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginListXmlCPr.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginListCol.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndListCols.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndListCol.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginAFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndListXmlCPr.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/List14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/Top10Filter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/Top10RichFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndAFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndFilterColumn.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/IconFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/IconFilter14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/ColorFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/DynamicFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginFilterColumn.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/AFilterDateGroupItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/RichFilterDateGroupItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/Filter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/CustomFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginCustomFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/CustomFilter14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndCustomFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginCustomFilters14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/Filter14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/DynamicRichFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginRichFilterColumn.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndRichFilterColumn.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/RichFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginRichFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndRichFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/CustomRichFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginCustomRichFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndCustomRichFilters.cpp"
 // Biff12_structures
     #include "../Source/XlsbFormat/Biff12_structures/LPByteBuf.cpp"
     #include "../Source/XlsbFormat/Biff12_structures/IsoPasswordData.cpp"
@@ -233,8 +275,10 @@
     #include "../Source/XlsbFormat/Biff12_structures/FRTFormula.cpp"
     #include "../Source/XlsbFormat/Biff12_structures/FRTParsedFormula.cpp"
     #include "../Source/XlsbFormat/Biff12_structures/FRTRelID.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/ListType.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/XmlDataType.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/ListTotalRowFunction.cpp"
 // Biff12_unions
-    #include "../Source/XlsbFormat/Biff12_unions/ACFONTS.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/FRT.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/ACUID.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/ACABSPATH.cpp"
@@ -284,6 +328,7 @@
     #include "../Source/XlsbFormat/Biff12_unions/ACFMT.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/FMTS.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/FONTS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ACFONTS.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/FILLS.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/BORDERS.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/CELLSTYLEXFS.cpp"
@@ -310,3 +355,19 @@
     #include "../Source/XlsbFormat/Biff12_unions/COMMENTLIST.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/COMMENTAUTHORS.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/COMMENTS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTTABLE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/TABLE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/LISTCOLS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/LISTCOL.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/LISTXMLCPR.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/AUTOFILTER.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FILTERCOLUMN.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ACICONFILTER.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ACFILTERCONTENT.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FILTERS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/CUSTOMFILTERS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ACCUSTOMFILTER.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ACFILTERS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/RICHFILTERCONTENT.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/RICHFILTERS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/CUSTOMRICHFILTERS.cpp"