More progress on hSDK header