Moving #includes. Conversion bug fixes