I remembered that Felix is selling xforce headers for D16 blocks. You can check with him if it suit yours.