Structures changes (again) and contant redefinition