Unify global variables
Unify Defines and includes