cosmetics
Move the common definition in the header file
Organize the include targets
Integrate common code