Simplify source file declarations