*
***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
/* Portable, consistent toupper (remember EBCDIC). Do not use toupper() because
its behavior is altered by the current locale. */