Remove includes for old devices