Unbreak barrier makefile

Move the makefile inclusion inside the device validation...