Fix: Duplicate declaration errors