Removing extra defines and includes