This is what ServoTimer2.cpp looks like now:
/* ServoTimer2.cpp*/
extern "C" {
// AVR LibC Includes
#include <Arduino.h>
}
#include <wiring.h>
#include "ServoTimer2.h"
static void initISR();
static void writeChan(uint8_t chan, int pulsewidth);
...