Add missing #include
Move command-line options code to a common file