fix #defines and #includes