Fixed defines and includes