Add the needed #include, emit enums with the sizes of tables, remove