--- src/applications/mailer/axmail.h.orig	2013-08-20 13:44:26.129175528 -0700
+++ src/applications/mailer/axmail.h	2013-08-21 16:10:12.555053262 -0700
@@ -6,7 +6,7 @@
 #ifndef AXMAIL_H
 #define AXMAIL_H
 
-#include <vector.h>
+#include <vector>
 
 //Library initialization with default paths
 void axmail_init();
@@ -134,7 +134,7 @@
       char *call;                   //BBS callsign w/o ssid
       char *path;                   //index path
       int lastnum;                  //highest known message number
-      vector <Message *> messages;  //list of messages
+      std::vector <Message *> messages;  //list of messages
 
       void updateList();            //remove deleted messages
       void clearList();             //clear the list of messages
--- src/applications/libaxmail/axmail.h.orig	2013-08-21 18:23:23.843970215 -0700
+++ src/applications/libaxmail/axmail.h	2013-08-21 16:10:12.555053262 -0700
@@ -6,7 +6,7 @@
 #ifndef AXMAIL_H
 #define AXMAIL_H
 
-#include <vector.h>
+#include <vector>
 
 //Library initialization with default paths
 void axmail_init();
@@ -134,7 +134,7 @@
       char *call;                   //BBS callsign w/o ssid
       char *path;                   //index path
       int lastnum;                  //highest known message number
-      vector <Message *> messages;  //list of messages
+      std::vector <Message *> messages;  //list of messages
 
       void updateList();            //remove deleted messages
       void clearList();             //clear the list of messages
--- src/applications/libaxmail/axmail.cc.orig	2013-08-20 13:44:04.489039478 -0700
+++ src/applications/libaxmail/axmail.cc	2013-08-21 16:08:20.499137385 -0700
@@ -392,7 +392,7 @@
 
 void MessageIndex::updateList()
 {
-   vector <Message *>::iterator it;
+   std::vector <Message *>::iterator it;
    for (it = messages.begin(); it < messages.end(); it++)
    {
       if ((*it)->isDel())
@@ -406,7 +406,7 @@
 
 void MessageIndex::clearList()
 {
-   vector <Message *>::iterator it;
+   std::vector <Message *>::iterator it;
    for (it = messages.begin(); it < messages.end(); it++)
       delete *it;
    messages.erase(messages.begin(), messages.end());
@@ -520,7 +520,7 @@
 
 IncommingIndex::~IncommingIndex()
 {
-   vector <Message *>::iterator it;
+   std::vector <Message *>::iterator it;
    for (it = messages.begin(); it < messages.end(); it++)
       delete *it;
 }
@@ -617,7 +617,7 @@
       if (!messages.empty())
       {
          int actnum = messages[0]->getNum();
-         vector <Message *>::iterator it;
+         std::vector <Message *>::iterator it;
          for (it = messages.begin(); it < messages.end(); it++)
          {
             if ((*it)->getNum() > actnum+1)
@@ -667,7 +667,7 @@
 
 OutgoingIndex::~OutgoingIndex()
 {
-   vector <Message *>::iterator it;
+   std::vector <Message *>::iterator it;
    for (it = messages.begin(); it < messages.end(); it++)
       delete *it;
 }
@@ -751,7 +751,7 @@
       if (!messages.empty())
       {
          int actnum = messages[0]->getNum();
-         vector <Message *>::iterator it;
+         std::vector <Message *>::iterator it;
          for (it = messages.begin(); it < messages.end(); it++)
          {
             if ((*it)->getNum() > actnum+1)
--- src/applications/mailer/mail_filt.h.orig	2013-08-21 16:13:18.955568579 -0700
+++ src/applications/mailer/mail_filt.h	2013-08-21 16:14:07.601962403 -0700
@@ -9,7 +9,7 @@
 
   mail_filter.h - select message destinations
 */
-#include <vector.h>
+#include <vector>
 #include <axmail.h>
 #include "mail_screen.h"
 #include "mail_input.h"
@@ -24,8 +24,8 @@
 };
 
 //Vector of selected boards
-extern vector <tbname> bfilter;
-extern vector <tbname>::iterator bfit;
+extern std::vector <tbname> bfilter;
+extern std::vector <tbname>::iterator bfit;
 
 //Message info
 struct Msg
@@ -50,7 +50,7 @@
 class BGroup : public Board
 {
   public:
-    vector <tbname> content;
+    std::vector <tbname> content;
 
     bool contains(const char *name);
     BGroup &operator = (const BGroup &);
@@ -75,11 +75,11 @@
     screen_obj *old_focused;
 
   public:
-    vector <Board> boards;
-    vector <BGroup> groups;
+    std::vector <Board> boards;
+    std::vector <BGroup> groups;
     
-    BoardList(MessageIndex *ndx, vector <Msg> &, char *mycall);
-    BoardList(vector <Board> &);
+    BoardList(MessageIndex *ndx, std::vector <Msg> &, char *mycall);
+    BoardList(std::vector <Board> &);
     void init_screen(void *pwin, int height, int width, int wy, int wx);
 
     void save_groups();
@@ -95,6 +95,6 @@
 };
 
 //Create the sorted list of boards from message list
-void create_list(MessageIndex *ndx, vector <Msg> &, vector <Board> &,
+void create_list(MessageIndex *ndx, std::vector <Msg> &, std::vector <Board> &,
                  char *mycall);
 
--- src/applications/mailer/mail_filt.cc.orig	2013-08-21 16:14:48.261291058 -0700
+++ src/applications/mailer/mail_filt.cc	2013-08-21 16:15:57.105846494 -0700
@@ -18,8 +18,8 @@
 #define COLUMN1 20
 #define COLUMN2 40
 
-vector <tbname> bfilter;
-vector <tbname>::iterator bfit;
+std::vector <tbname> bfilter;
+std::vector <tbname>::iterator bfit;
 
 tbname &tbname::operator = (const tbname &src)
 {
@@ -27,10 +27,10 @@
   return *this;
 }
 
-void create_list(MessageIndex *ndx, vector <Msg> &msgs,
-                 vector <Board> &boards, char *mycall)
+void create_list(MessageIndex *ndx, std::vector <Msg> &msgs,
+                 std::vector <Board> &boards, char *mycall)
 {
-   vector <Msg>::iterator it;
+   std::vector <Msg>::iterator it;
    for (it = msgs.begin(); it < msgs.end(); it++)
       if (strchr(ndx->getMessage(it->index)->getFlags(), 'B') != NULL)
       {
@@ -51,7 +51,7 @@
 
    //sort it
    sort(boards.begin(), boards.end());
-   vector <Board>::iterator where = unique(boards.begin(), boards.end());
+   std::vector <Board>::iterator where = unique(boards.begin(), boards.end());
    boards.erase(where, boards.end());
 }
 
@@ -81,7 +81,7 @@
 
 bool BGroup::contains(const char *name)
 {
-   vector <tbname>::iterator it;
+   std::vector <tbname>::iterator it;
    for (it = content.begin(); it < content.end(); it++)
       if (strcasecmp(name, it->name) == 0) return true;
    return false;
@@ -98,7 +98,7 @@
 //=========================================================================
 // Class BoardList
 //=========================================================================
-BoardList::BoardList(MessageIndex *ndx, vector <Msg> &msgs, char *mycall)
+BoardList::BoardList(MessageIndex *ndx, std::vector <Msg> &msgs, char *mycall)
 {
    create_list(ndx, msgs, boards, mycall);
    pos = 0;
@@ -116,7 +116,7 @@
    load_groups();
 }
 
-BoardList::BoardList(vector <Board> &bds)
+BoardList::BoardList(std::vector <Board> &bds)
 {
    boards = bds;
    pos = 0;
@@ -156,11 +156,11 @@
    f = fopen(fname, "w");
    if (f != NULL)
    {
-      vector <BGroup>::iterator it;
+      std::vector <BGroup>::iterator it;
       for (it = groups.begin()+1; it < groups.end(); it++)
       {
          fprintf(f, "[%s]\n", it->name);
-         vector <tbname>::iterator bname;
+         std::vector <tbname>::iterator bname;
          for (bname = it->content.begin(); bname < it->content.end(); bname++)
             fprintf(f, "%s\n", bname->name);
          fprintf(f, "\n");
@@ -227,7 +227,7 @@
 
 void BoardList::delete_group(int sel)
 {
-   vector <BGroup>::iterator it = groups.begin();
+   std::vector <BGroup>::iterator it = groups.begin();
    for (int i = 0; i < sel; i++) it++;
    groups.erase(it);
 }
@@ -338,7 +338,7 @@
       newgrp.sel = false;
 
       tbname newname;
-      vector <Board>::iterator it;
+      std::vector <Board>::iterator it;
       for (it = boards.begin(); it < boards.end(); it++)
         if (it->sel)
         {
@@ -433,7 +433,7 @@
     //select bulletins in group
     if (col == 0)
     {
-      vector <Board>::iterator it;
+      std::vector <Board>::iterator it;
       for (it = boards.begin(); it < boards.end(); it++)
         it->sel = groups[gslct].contains(it->name) ||
                   groups[gslct].content.empty();
@@ -451,7 +451,7 @@
 
     if (col == 1 && ev->x == '*')
     {
-      vector <Board>::iterator it;
+      std::vector <Board>::iterator it;
       for (it = boards.begin(); it < boards.end(); it++)
         it->sel = !it->sel;
     }
@@ -463,7 +463,7 @@
       //update bfilter
       tbname newname;
       clear_filter();
-      vector <Board>::iterator it;
+      std::vector <Board>::iterator it;
       for (it = boards.begin(); it < boards.end(); it++)
         if (it->sel)
         {
--- src/applications/mailer/mail_list.h.orig	2013-08-21 16:11:23.899634441 -0700
+++ src/applications/mailer/mail_list.h	2013-08-21 16:12:11.963025130 -0700
@@ -9,7 +9,7 @@
 
   mail_list.h - message list viewer and text viewer
 */
-#include <vector.h>
+#include <vector>
 #include "mail_screen.h"
 #include "mail_filt.h"
 #include "mail_input.h"
@@ -39,7 +39,7 @@
     screen_obj *old_focused;
 
   public:
-    vector <char *> line;
+    std::vector <char *> line;
 
     TheFile(Message *themsg);
     virtual ~TheFile();
@@ -73,8 +73,8 @@
       int folder;        //displayed folder
 
       MessageIndex *ndx; //message index
-      vector <Msg> msg;  //filtered message list
-      vector <Board> boards; //list of boards
+      std::vector <Msg> msg;  //filtered message list
+      std::vector <Board> boards; //list of boards
 
       //saved old screen status
       void *old_focus_window;
@@ -101,7 +101,7 @@
       bool readable(int index);        //is this message readable ?
       bool check_filter(int index);    //is this message visible through filter ?
       int selected();                  //index of selected message
-      void del_msg(vector <Msg>::iterator it); //delete message
+      void del_msg(std::vector <Msg>::iterator it); //delete message
       void draw_line(int i);           //draw a single screen line
 
       virtual void handle_event(Event *);
--- src/applications/mailer/mail_list.cc.orig	2013-08-21 16:21:36.974570005 -0700
+++ src/applications/mailer/mail_list.cc	2013-08-21 16:51:50.621850529 -0700
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include "mail_list.h"
 #include "mail_comp.h"
@@ -116,7 +117,7 @@
 
 long Messages::max()
 {
-   vector <Msg>::iterator it;
+   std::vector <Msg>::iterator it;
    int mx = 0;
    for (it = msg.begin(); it < msg.end(); it++)
    {
@@ -128,7 +129,7 @@
 
 long Messages::min()
 {
-   vector <Msg>::iterator it;
+   std::vector <Msg>::iterator it;
    int mx = -1;
    for (it = msg.begin(); it < msg.end(); it++)
    {
@@ -140,7 +141,7 @@
 
 long Messages::last_read()
 {
-   vector <Msg>::iterator it;
+   std::vector <Msg>::iterator it;
    int m = 0;
    int i;
    for (i = 0, it = msg.begin(); it < msg.end(); it++,i++)
@@ -183,7 +184,7 @@
    return false;
 }
 
-void Messages::del_msg(vector <Msg>::iterator where) //delete message
+void Messages::del_msg(std::vector <Msg>::iterator where) //delete message
 {
    msg.erase(where);
 }
@@ -207,14 +208,14 @@
 
 TheFile::~TheFile()
 {
-   vector <char *>::iterator it;
+   std::vector <char *>::iterator it;
    for (it = line.begin(); it < line.end(); it++)
       if (*it != NULL) delete [] (*it);
 }
 
 void TheFile::destroy_message()
 {
-   vector <char *>::iterator it;
+   std::vector <char *>::iterator it;
    for (it = line.begin(); it < line.end(); it++)
       if (*it != NULL) delete[] (*it);
    line.erase(line.begin(), line.end());
@@ -429,7 +430,7 @@
 unsigned TheFile::max_len()
 {
   unsigned r = 0;
-  vector <char *>::iterator it;
+  std::vector <char *>::iterator it;
   for (it = line.begin(); it < line.end(); it++)
     if (strlen(*it) > r) r = strlen(*it);
   return r;
@@ -437,7 +438,7 @@
 
 bool TheFile::return_addr(char *result)
 {
-  vector <char *>::iterator it;
+  std::vector <char *>::iterator it;
 
   //try to find "Reply-To:" line
   for (it = line.begin(); it < line.end(); it++)
@@ -711,7 +712,7 @@
   
       if (toupper(ev->x) == 'D' && state == STATE_NORM) //Delete messages
       {
-         vector <Msg>::iterator it;
+         std::vector <Msg>::iterator it;
 
          //Count marked messages
          int sel = 0;
@@ -752,7 +753,7 @@
   
       if (ev->x == CTRLX) //Ctrl-X : delete messages
       {
-         vector <Msg>::iterator it;
+         std::vector <Msg>::iterator it;
 
          //Count marked messages
          int sel = 0;
--- src/applications/mailer/mail_edit.cc.orig	2013-08-21 21:13:35.908002579 -0700
+++ src/applications/mailer/mail_edit.cc	2013-08-21 21:15:27.570101125 -0700
@@ -15,6 +15,7 @@
 #include <ctype.h>
 #include <time.h>
 #include <unistd.h>
+#include <cstdlib>
 #include <axmail.h>
 
 #include "lpapp.h"
--- src/applications/mailer/mail_route.cc.orig	2013-08-21 16:53:35.189661964 -0700
+++ src/applications/mailer/mail_route.cc	2013-08-21 16:54:22.631029416 -0700
@@ -10,7 +10,7 @@
   mail_route.h - mail routes database
 */
 #include <algorithm>
-#include <vector.h>
+#include <vector>
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/time.h>
@@ -56,7 +56,7 @@
 }
 
 
-vector <route_addr> routes;
+std::vector <route_addr> routes;
     
 //-----------------------------------------------------------------------
 
@@ -93,8 +93,8 @@
 
 bool find_route(char *call, char *result)
 {
-  vector <route_addr> cands;
-  vector <route_addr>::iterator it, home;
+  std::vector <route_addr> cands;
+  std::vector <route_addr>::iterator it, home;
   bool found = false;
 
   //select candidates
--- src/data.h.orig	2013-08-21 16:58:38.950007529 -0700
+++ src/data.h	2013-08-21 16:58:15.455826709 -0700
@@ -16,7 +16,7 @@
 #ifndef DATA_H
 #define DATA_H
 
-#include <vector.h>
+#include <vector>
 #include "constants.h"
 #include "version.h"
 #include "event.h"
@@ -145,7 +145,7 @@
     operator char*();
 };
 
-extern vector <RCommand> aclist[MAX_CHN+1];
+extern std::vector <RCommand> aclist[MAX_CHN+1];
 
 //------------------------------------------------------------------------
 // Miscelancelous data
@@ -227,7 +227,7 @@
 class Cooker : public Object
 {
   private:
-    vector <cook_task *> tasks;
+    std::vector <cook_task *> tasks;
     int newhandle;
     char expr[256];
     char lastline[MAX_CHN+1][256]; //last line received (for %< macro)
--- src/data.cc.orig	2013-08-21 16:58:46.750067540 -0700
+++ src/data.cc	2013-08-21 17:05:02.221944006 -0700
@@ -17,8 +17,10 @@
 #include <ctype.h>
 #include <string.h>
 #include <unistd.h>
+#include <cstdlib>
 #include <errno.h>
 #include <sys/time.h>
+#include <ctime>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -311,7 +313,7 @@
   return name;
 }
 
-vector <RCommand> aclist[MAX_CHN+1];
+std::vector <RCommand> aclist[MAX_CHN+1];
 
 
 //Misc
@@ -763,7 +765,7 @@
   }
   if (ev.type == EV_CMD_RESULT)
   {
-    vector <cook_task *>::iterator it;
+    std::vector <cook_task *>::iterator it;
     for (it = tasks.begin(); it < tasks.end(); it++)
       if ((*it)->handle == ev.x) break;
     if (it < tasks.end())
@@ -795,7 +797,7 @@
 
 Cooker::~Cooker()
 {
-  vector <cook_task *>::iterator it;
+  std::vector <cook_task *>::iterator it;
   for (it = tasks.begin(); it < tasks.end(); it++)
   {
     delete (*it)->args;
--- src/event.h.orig	2013-08-21 17:00:44.278970483 -0700
+++ src/event.h	2013-08-21 17:01:03.326116592 -0700
@@ -18,7 +18,7 @@
 
 #define OWN_DATA
 
-#include <vector.h>
+#include <vector>
 #include "tevent.h"
 
 //-------------------------------------------------------------------------
@@ -39,8 +39,8 @@
 {
   private:
     unsigned next_oid;           //next free object id
-    vector <Object *> children;  //list of inserted objects
-    vector <Object *> active;    //active objects (receive events)
+    std::vector <Object *> children;  //list of inserted objects
+    std::vector <Object *> active;    //active objects (receive events)
 
   public:
     bool quit;
--- src/event.cc.orig	2013-08-21 17:01:21.886258907 -0700
+++ src/event.cc	2013-08-21 17:02:24.876741470 -0700
@@ -98,7 +98,7 @@
 
 void Obj_man::find_oid()
 {
-  vector <Object *>::iterator it;
+  std::vector <Object *>::iterator it;
   unsigned old_value = next_oid;
   bool ok;
   do
@@ -122,7 +122,7 @@
 
 void Obj_man::remove(Object *obj)
 {
-  vector <Object *>::iterator it;
+  std::vector <Object *>::iterator it;
   //Remove from object list
   for (it=children.begin(); it < children.end(); it++) if (*it==obj) break;
   if (it != children.end())
@@ -141,7 +141,7 @@
 
 void Obj_man::remove(unsigned aoid)
 {
-  vector <Object *>::iterator it;
+  std::vector <Object *>::iterator it;
   //Remove from object list
   for (it=children.begin(); it < children.end(); it++)
     if ((*it)->oid == aoid) break;
@@ -294,7 +294,7 @@
 
 void Obj_man::stop()
 {
-  vector <Object *>::iterator it;
+  std::vector <Object *>::iterator it;
   for (it=children.begin(); it < children.end(); it++)
      delete *it;
   children.erase(children.begin(), children.end());
@@ -313,7 +313,7 @@
   #endif
   #endif
   fprintf(stderr, " oid   class_name\n");
-  vector <Object *>::iterator it;
+  std::vector <Object *>::iterator it;
   for (it=children.begin(); it < children.end(); it++)
   {
     fprintf(stderr, "%5i  %s\n", (*it)->oid, (*it)->class_name);
@@ -323,7 +323,7 @@
 
 void Obj_man::deactivate(char *obj_name)
 {
-   vector <Object *>::iterator it;
+   std::vector <Object *>::iterator it;
    //Remove from active objects
    for (it=active.begin(); it < active.end(); it++)
       if (strcmp((*it)->class_name, obj_name) == 0) break;
@@ -336,7 +336,7 @@
 
 void Obj_man::activate(char *obj_name)
 {
-   vector <Object *>::iterator objs, act;
+   std::vector <Object *>::iterator objs, act;
    //Find the right position for an object in active objects
    act = active.begin();
    for (objs = children.begin();
--- src/sources.h.orig	2013-08-21 17:05:58.446372739 -0700
+++ src/sources.h	2013-08-21 17:08:22.380468028 -0700
@@ -126,8 +126,8 @@
     int sock;
     char data[MAX_EVENT_DATA];
     int pid;          //what PID is this gate for ? (0 = base gate)
-    vector <tapp> *pids;
-    vector <EventGate *> children; //sockets of child gates
+    std::vector <tapp> *pids;
+    std::vector <EventGate *> children; //sockets of child gates
     fd_set rfds;      //child descriptors
     int maxdesc;      //maximal descriptor value
     EventGate *parent_gate; //parent gate
@@ -165,7 +165,7 @@
     bool parse_event_cmd();
 
   public:
-    EventGate(int socknum, EventGate *parent = NULL, vector <tapp> *ppids = NULL);
+    EventGate(int socknum, EventGate *parent = NULL, std::vector <tapp> *ppids = NULL);
     virtual ~EventGate();
     virtual void handle_event(const Event &);
 
--- src/sources.cc.orig	2013-08-21 17:06:55.845809916 -0700
+++ src/sources.cc	2013-08-21 17:07:36.472119031 -0700
@@ -922,7 +922,7 @@
 //--------------------------------------------------------------------------
 // Class EventGate
 //--------------------------------------------------------------------------
-EventGate::EventGate(int socknum, EventGate *parent, vector <tapp> *ppids)
+EventGate::EventGate(int socknum, EventGate *parent, std::vector <tapp> *ppids)
 {
   sprintf(class_name, "EventGt?");
   rbuff = NULL;
@@ -944,7 +944,7 @@
   if (socknum == 0)
   {
      pid = 0; //we are the base gate
-     pids = new vector<tapp>;
+     pids = new std::vector<tapp>;
      
      sock = socket(AF_INET, SOCK_STREAM, 0);
      if (sock == -1) Error(errno, "EventGate: cannot create socket");
@@ -1291,7 +1291,7 @@
 
       bool fnd = false;
       bool cont = true;
-      vector <tapp>::iterator it;
+      std::vector <tapp>::iterator it;
       for (it = pids->begin(); it < pids->end(); it++)
          if (it->pid == ev.x)
          {
@@ -1420,7 +1420,7 @@
        if (rc>0)
        {
           if (FD_ISSET(sock, &rdset)) data_arrived();
-          vector <EventGate *>::iterator it;
+          std::vector <EventGate *>::iterator it;
           for (it = children.begin(); it < children.end(); it++)
              if (FD_ISSET((*it)->get_sock(), &rdset))
                 (*it)->data_arrived();
@@ -1474,7 +1474,7 @@
     }
     
     //check waiting gates
-    vector <tapp>::iterator it;
+    std::vector <tapp>::iterator it;
     for (it = pids->begin(); it < pids->end(); it++)
        if (it->gate && time(NULL) > it->started + MAX_GATE_WAIT)
        { //waiting too long - application probably won't start
@@ -1497,7 +1497,7 @@
   if (ev.type == EV_PROCESS_FINISHED && pid == 0)
   {
     //remove the application entry from PID list
-    vector <tapp>::iterator it;
+    std::vector <tapp>::iterator it;
     for (it = pids->begin(); it < pids->end(); it++)
        if (it->pid == ev.x) {pids->erase(it); break;}
   }
@@ -1604,7 +1604,7 @@
 
 void EventGate::child_finished(EventGate *child)
 {
-   vector <EventGate *>::iterator it;
+   std::vector <EventGate *>::iterator it;
    maxdesc = 0;
    for (it = children.begin(); it < children.end(); it++)
       if (*it == child)
@@ -1618,7 +1618,7 @@
 
 void EventGate::change_child(EventGate *from, EventGate *to)
 {
-   vector <EventGate *>::iterator it;
+   std::vector <EventGate *>::iterator it;
    maxdesc = 0;
    for (it = children.begin(); it < children.end(); it++)
       if (*it == from)
--- src/watch.h.orig	2013-08-21 17:11:38.812041696 -0700
+++ src/watch.h	2013-08-21 17:11:57.366194122 -0700
@@ -18,7 +18,7 @@
 
 #define WATCH_BUFFER_SIZE 1024
 
-#include <vector.h>
+#include <vector>
 #include "event.h"
 #include "constants.h"
 
@@ -32,7 +32,7 @@
 class Watch : public Object
 {
   private:
-    vector <autorun_entry> watch;             //list of autorun entries
+    std::vector <autorun_entry> watch;             //list of autorun entries
     char buf[MAX_CHN+1][WATCH_BUFFER_SIZE];
     int buflen[MAX_CHN+1];
     bool disabled[MAX_CHN+1]; //watching is disabled (binary transfer)
--- src/watch.cc.orig	2013-08-21 17:12:17.672360865 -0700
+++ src/watch.cc	2013-08-21 17:12:30.502466177 -0700
@@ -55,7 +55,7 @@
       buflen[ev.chn]++;
     }
     //try to find all keys in bufer
-    vector <autorun_entry>::iterator it;
+    std::vector <autorun_entry>::iterator it;
     for (it = watch.begin(); it < watch.end(); it++)
     {
       if ((it->chn == ev.chn || it->chn == 0) && key_found(ev.chn, it->key))
--- src/commands.h.orig	2013-08-21 17:13:06.064757913 -0700
+++ src/commands.h	2013-08-21 17:13:30.221955948 -0700
@@ -13,7 +13,7 @@
 
    Last update 24.6.2002
   =========================================================================*/
-#include <vector.h>
+#include <vector>
 #include "event.h"
 #include "sources.h"
 #include "data.h"
@@ -38,7 +38,7 @@
     int chn;
     int pos;                //line position
     int max;                //number of lines
-    vector <char *> prg;    //lines
+    std::vector <char *> prg;    //lines
     char s[256];
     Arguments args;         //for sending arguments of macro
     bool macro;             //translating from 'macro' notation
@@ -56,7 +56,7 @@
     void index_conds();            //index conditions
     int compare(const char *s1, const char *s2); //compare strings or numbers
     bool true_condition(char *s);  //return true, when condition is true
-    void clear_prg(vector <char *> &); //clear prg structure
+    void clear_prg(std::vector <char *> &); //clear prg structure
     virtual ~Macro();
 };
 
@@ -72,10 +72,10 @@
     bool secure;   //command from secure source - do not check permissions
     bool send_res; //result must be sent back
     bool remote_disabled[MAX_CHN+1]; //remote commands are disabled due to binary transfer
-    vector <Command> reg; //registered commands handled by ext. application
-    vector <Command> bin; //commands found in ./bin
-    vector <Command> mac; //commands found in ./macro (default language)
-    vector <Command> lmac; //macro commands for selected language
+    std::vector <Command> reg; //registered commands handled by ext. application
+    std::vector <Command> bin; //commands found in ./bin
+    std::vector <Command> mac; //commands found in ./macro (default language)
+    std::vector <Command> lmac; //macro commands for selected language
     ExternCmd *ext;
     Macro *mcm;
     int res_hnd; //result handle (when send_res == true)
--- src/commands.cc.orig	2013-08-21 17:13:51.441129805 -0700
+++ src/commands.cc	2013-08-21 17:14:56.878665426 -0700
@@ -224,7 +224,7 @@
      while (strlen(comm.cmd) < 15 && isalpha(*p))
         { strncat(comm.cmd, p, 1); p++; }
      
-     vector <Command>::iterator it;
+     std::vector <Command>::iterator it;
      bool exists = false;
      for (it = reg.begin(); it < reg.end(); it++)
         if (strcmp(it->cmd, comm.cmd) == 0) {exists = true; break;}
@@ -242,7 +242,7 @@
      while (strlen(comm.cmd) < 15 && isalpha(*p))
         { strncat(comm.cmd, p, 1); p++; }
      
-     vector <Command>::iterator it;
+     std::vector <Command>::iterator it;
      for (it = reg.begin(); it < reg.end(); it++)
         if (strcmp(it->cmd, comm.cmd) == 0)
         {
@@ -345,7 +345,7 @@
 {
   if (secure) return true;
   bool sec = false;
-  vector <RCommand>::iterator it;
+  std::vector <RCommand>::iterator it;
   for (it = aclist[echn].begin(); it < aclist[echn].end() && !sec; it++)
   {
     char *p = strdup(*it);
@@ -923,7 +923,7 @@
                                   }
                                   else
                                   {
-                                    vector <RCommand>::iterator it;
+                                    std::vector <RCommand>::iterator it;
                                     for (it = aclist[chn].begin();
                                          it < aclist[chn].end();
                                          it++)
@@ -966,7 +966,7 @@
   //Try to find unknown cmd in registered commands
   if (!ok)
   {
-    vector <Command>::iterator it;
+    std::vector <Command>::iterator it;
     for (it = reg.begin(); it < reg.end(); it++)
       if (com_ok(chn, echn, cmd, it->cmd))
       {
@@ -985,7 +985,7 @@
   //Try to find unknown cmd in "./macro"
   if (!ok)
   {
-    vector <Command>::iterator it;
+    std::vector <Command>::iterator it;
     char *lang = get_var(chn, "STN_LANG");
     if (lang != NULL) //try to find in specified language
     {
@@ -1015,7 +1015,7 @@
   //Try to found unknown cmd in "./bin"
   if (!ok)
   {
-    vector <Command>::iterator it;
+    std::vector <Command>::iterator it;
     for (it = bin.begin(); it < bin.end(); it++)
       if (com_ok(chn, echn, cmd, (*it).cmd))
         if (!remote || strchr((*it).flags, 'L') == NULL) //isn't it only local cmd ?
@@ -1251,7 +1251,7 @@
   if (argc > 1 && argv[1][0] == '@')
   {
     char s[256];
-    vector <char *>::iterator it;
+    std::vector <char *>::iterator it;
     it = prg.begin();
     if (macro) it++;
     snprintf(s, 255, ":GOTO %s", &(argv[1][1]));
@@ -1375,7 +1375,7 @@
 
 int Macro::label_line(char *label)
 {
-  vector <char *>::iterator it;
+  std::vector <char *>::iterator it;
   int line = 0;
   for (it = prg.begin(); it < prg.end(); it++, line++)
     if (strncasecmp(*it, ":LABEL ", 7) == 0)
@@ -1482,8 +1482,8 @@
          ... commands ...
   */
   Stack <int> stk;
-  vector <char *>::iterator it;
-  vector <char *> newprg;
+  std::vector <char *>::iterator it;
+  std::vector <char *> newprg;
   int line = 0;
   int destline = 0;
   char s[256];
@@ -1644,9 +1644,9 @@
   return b;
 }
 
-void Macro::clear_prg(vector <char *> &prg)
+void Macro::clear_prg(std::vector <char *> &prg)
 {
-  vector <char *>::iterator it;
+  std::vector <char *>::iterator it;
   for (it = prg.begin(); it < prg.end(); it++)
     delete[] *it;
   prg.erase(prg.begin(), prg.end());
--- src/screen.h.orig	2013-08-21 17:15:26.950911305 -0700
+++ src/screen.h	2013-08-21 17:15:46.010067051 -0700
@@ -17,7 +17,7 @@
 #ifndef SCREEN_H
 #define SCREEN_H
 
-#include <vector.h>
+#include <vector>
 #include <ncurses.h>
 #include "event.h"
 #include "constants.h"
@@ -41,7 +41,7 @@
 {
   private:
     WINDOW *mainwin;
-    vector <Screen_obj *> children;  //list of inserted objects
+    std::vector <Screen_obj *> children;  //list of inserted objects
 
   public:
     Screen();
--- src/screen.cc.orig	2013-08-21 17:16:13.263289639 -0700
+++ src/screen.cc	2013-08-21 17:16:27.150403009 -0700
@@ -39,7 +39,7 @@
 
 void Screen::redraw()
 {
-  vector <Screen_obj *>::iterator it;
+  std::vector <Screen_obj *>::iterator it;
   for (it=children.begin(); it<children.end(); it++)
     (*it)->draw();
 }
--- src/windows.h.orig	2013-08-21 17:16:54.967629992 -0700
+++ src/windows.h	2013-08-21 17:24:17.311221164 -0700
@@ -6,11 +6,11 @@
    modify it under the terms of the GNU General Public License
    as published by the Free Software Foundation; either version
    2 of the license, or (at your option) any later version.
-
+
    windows.h
-
+
    This module contains objects for terminal output windows
-
+
    Last update 29.10.2001
   =========================================================================*/
 #ifndef WINDOWS_H
@@ -19,6 +19,7 @@
 #include "infoline.h"
 #include <ncurses.h>
 #include <sys/time.h>
+#include <ctime>
 #include "screen.h"
 #include "constants.h"
 
@@ -212,7 +213,7 @@
 {
   private:
     WINDOW *win;
-    vector <info_line> lines;
+    std::vector <info_line> lines;
     int nlines;
     int mychn;
     bool act;
--- src/windows.cc.orig	2013-08-21 17:17:39.774995318 -0700
+++ src/windows.cc	2013-08-21 17:20:52.079559173 -0700
@@ -19,6 +19,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <cstdlib>
 #include <signal.h>
 #include <sys/stat.h>
 
@@ -1349,7 +1350,7 @@
 
 void StatLines::handle_event(const Event &ev)
 {
-  vector <info_line>::iterator it;
+  std::vector <info_line>::iterator it;
 
   switch(ev.type)
   {
--- src/infoline.h.orig	2013-08-21 17:18:35.465448873 -0700
+++ src/infoline.h	2013-08-21 17:19:03.911680332 -0700
@@ -13,7 +13,7 @@
 
    Last update 19.9.1998
   =========================================================================*/
-#include <vector.h>
+#include <vector>
 
 class info_line
 {
@@ -27,4 +27,4 @@
 
 //This fixes the stupid ncurses 'erase' macro that overrides all
 //vector::erase() functions
-void info_line_erase(vector <info_line> &v, vector <info_line>::iterator it);
+void info_line_erase(std::vector <info_line> &v, std::vector <info_line>::iterator it);
--- src/infoline.cc.orig	2013-08-21 17:19:16.262780786 -0700
+++ src/infoline.cc	2013-08-21 17:19:38.341960292 -0700
@@ -15,7 +15,7 @@
   =========================================================================*/
 #include "infoline.h"
 
-void info_line_erase(vector <info_line> &v, vector <info_line>::iterator it)
+void info_line_erase(std::vector <info_line> &v, std::vector <info_line>::iterator it)
 {
   v.erase(it);
 }
--- src/editor.cc.orig	2013-08-21 17:25:20.199729050 -0700
+++ src/editor.cc	2013-08-21 17:25:53.207995370 -0700
@@ -6,14 +6,14 @@
    modify it under the terms of the GNU General Public License
    as published by the Free Software Foundation; either version
    2 of the license, or (at your option) any later version.
-
+
    editor.cc
-
+
    Text/command editor objects
-
+
    Last update 29.1.2001
   =========================================================================*/
-#include <iostream.h>
+#include <iostream>
 #include <string.h>
 
 #include "constants.h"
--- src/keyboard.cc.orig	2013-08-21 17:26:53.281479615 -0700
+++ src/keyboard.cc	2013-08-21 17:39:11.449386066 -0700
@@ -20,6 +20,7 @@
 #include "keyboard.h"
 
 #include <string.h>
+#include <iostream>
 
 //--------------------------------------------------------------------------
 // Class Keyscan
@@ -46,7 +47,7 @@
   {
     int ch = wgetch(reinterpret_cast<WINDOW *>(keywin));
     //int ch = getch();
-    cout.flush();
+    std::cout.flush();
     if (ch != ERR)
     {
       Event re;