Fix inclusion order

Do not reset the build variables after including the shared components...