Put ImageBuffer into separate header