--- a/src/xs_sidplay2.cc	Mon Nov 05 22:43:24 2012 +0200
+++ b/src/xs_sidplay2.cc	Mon Nov 05 22:44:29 2012 +0200
@@ -31,7 +31,8 @@
 
 #ifdef HAVE_SIDPLAY2_FP
 #  include <sidplayfp/sidplay2.h>
-#  include <sidplayfp/SidTune.h>
+#  include <sidplayfp/SidTuneMod.h>
+#  include <sidplayfp/event.h>
 #else
 #  include <sidplay/sidplay2.h>
 #  include <sidplay/sidlazyiptr.h>
@@ -69,7 +70,7 @@
 
 #ifdef HAVE_RESID_BUILDER
 #  ifdef HAVE_SIDPLAY2_FP
-#    include <sidplayfp/builders/resid.h>
+#    include <sidplayfp/builders/residfp.h>
 #  else
 #    include <sidplay/builders/resid.h>
 #  endif
@@ -135,8 +136,11 @@
 gboolean xs_sidplay2_init(XSEngineState * state)
 {
     XSSIDPlay2 *engine;
+#ifndef HAVE_SIDPLAY2_FP
     sid_filter_t tmpFilter;
     xs_sid_filter_t *f;
+    gint i;
+#endif
     assert(state);
 
     /* Allocate internal structures */
@@ -158,7 +162,8 @@
     engine->config = engine->emu->config();
 
     /* Configure channels and stuff */
-    switch (state->audioChannels) {
+    switch (state->audioChannels)
+    {
         case XS_CHN_AUTOPAN:
             engine->config.playback = sid2_stereo;
             break;
@@ -176,7 +181,8 @@
 
 
     /* Memory mode settings */
-    switch (xs_cfg.memoryMode) {
+    switch (xs_cfg.memoryMode)
+    {
         case XS_MPU_BANK_SWITCHING:
             engine->config.environment = sid2_envBS;
             break;
@@ -208,7 +214,8 @@
     engine->config.frequency = state->audioFrequency;
 
 
-    switch (state->audioBitsPerSample) {
+    switch (state->audioBitsPerSample)
+    {
 #ifndef HAVE_SIDPLAY2_FP
         case XS_RES_8BIT:
             state->audioFormat = FMT_U8;
@@ -220,7 +227,8 @@
         default:
             state->audioFormat = FMT_S16_NE;
 #ifndef HAVE_SIDPLAY2_FP
-            switch (state->audioFormat) {
+            switch (state->audioFormat)
+            {
                 case FMT_U16_LE:
                     engine->config.sampleFormat = SID2_LITTLE_UNSIGNED;
                     break;
@@ -244,23 +252,25 @@
                 default:
                     engine->config.sampleFormat = SID2_NATIVE_SIGNED;
                     break;
-        }
+            }
 #endif
-        break;
+            break;
     }
     
 #if !defined(HAVE_SIDPLAY2_FP)
     /* Convert filter */
     f = &(xs_cfg.sid2Filter);
     XSDEBUG("using filter '%s', %d points\n", f->name, f->npoints);
-    if (f->npoints > XS_SIDPLAY2_NFPOINTS) {
+    if (f->npoints > XS_SIDPLAY2_NFPOINTS)
+    {
         xs_error("[SIDPlay2] Invalid number of filter curve points (%d > %d)\n",
             f->npoints, XS_SIDPLAY2_NFPOINTS);
         f->npoints = XS_SIDPLAY2_NFPOINTS;
     }
     
     tmpFilter.points = f->npoints;
-    for (i = 0; i < f->npoints; i++) {
+    for (i = 0; i < f->npoints; i++)
+    {
         tmpFilter.cutoff[i][0] = f->points[i].x;
         tmpFilter.cutoff[i][1] = f->points[i].y;
     }
@@ -394,7 +404,7 @@
         
         xs_cfg.sid2OptLevel = SID2_DEFAULT_OPTIMISATION;
     }
-    engine->currConfig.optimisation = xs_cfg.sid2OptLevel;
+    engine->config.optimisation = xs_cfg.sid2OptLevel;
 #endif
 
     engine->config.sidDefault = xs_cfg.mos8580 ? SID2_MOS8580 : SID2_MOS6581;