Troubles compiling for Azteeg X1 with Arduino

We're building our first printer and decided to use an Azteeg X1 with Repetier firmware.j

We've been having some trouble with the compiling and have investigated two options so far:

1) Repetier 0.91 with online configurator and Arduino 0023 with the Sanguino patch for mega1284p support (found on the RepRap/Azteeg wiki page)

The errors encountered are:
In file included from Extruder.cpp:23:
G:\Program Files (x86)\Arduino_0023\hardware\Sanguino\cores\arduino/pins_arduino.h:58: error: expected unqualified-id before numeric constant
G:\Program Files (x86)\Arduino_0023\hardware\Sanguino\cores\arduino/pins_arduino.h:61: error: expected unqualified-id before numeric constant

In my reading of some other posts, it appears that there may be some duplication of the pin assignments. From "hardware\Sanguino\cores\arduino/pins_arduino.h", lines 58-61 are:
const static uint8_t SS = 4;
const static uint8_t MOSI = 5;
const static uint8_t MISO = 6;
const static uint8_t SCK = 7;

and the lines in Repetier's pin.h that also refer to the SPI interface and include a reference to pin 4 are:
#define TEMP_0_PIN 7 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder)
#define TEMP_1_PIN 6 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed)
#define SDPOWER -1
#define SDSS 31
#define SCK_PIN 7
#define MISO_PIN 6
#define MOSI_PIN 5
#define HEATER_2_PIN -1
#define TEMP_2_PIN -1

#ifdef AZTEEG_X1
#define ORIG_FAN_PIN 4
#endif

I'm confused by a number of things such as why the MOSI pin is named MOSI in "pins_arduino.h" and MOSI_PIN in "pins.h", but I'll be satisfied to make the printer work and understand that later... (or now if you like )

Any ideas to resolve these errors would be greatly appreciated.

We also tried
2) Repetier 0.91 with online configurator and Arduino 1.05r2 with the Gen7 patch for mega1284p support (found on the RepRap/Gen7_Arduino_IDE_Support wiki page)

The errors we found there are:
gcode.cpp: In static member function 'static void GCode::pushCommand()':
gcode.cpp:215: error: cannot call member function 'void GCode::echoCommand()' without object

The associated lines of code look like:
void GCode::pushCommand()
{
bufferWriteIndex = (bufferWriteIndex+1) % GCODE_BUFFER_SIZE;
bufferLength++;
#ifndef ECHO_ON_EXECUTE
echoCommand();
#endif
}

Seems like there is another problem with incompatibility. We were under the impression that the Azteeg X1 and Gen7 were pin compatible.

Can anyone shed some light on this issue too?

Thanks for any advice!