Begin consolidation of of_device.h