Currently OutputFactory does many things. Removing duplicate declarations, filtering declarations for include options, lifts certain declarations to top-level, manages C names to be safe for Java. It'd be better to refactor OutputFactory to introduce various Declaraion Visitor classes each handling one aspect and leaving OutputFactory to just initialise various builders to handle actual code generation.