-- liboctave/oct-md5.cc
++ liboctave/oct-md5.cc
#include <string>
#include <vector>
#include <cstdio>
#ifdef HAVE_CONFIG_H
#include "config.h"
-- scripts/gethelp.cc
++ scripts/gethelp.cc
#include <iostream>
#ifndef NPOS
#define NPOS std::string::npos