--- a/src/xs_config.c	Mon Nov 05 20:03:14 2012 +0200
+++ b/src/xs_config.c	Mon Nov 05 20:04:05 2012 +0200
@@ -221,17 +221,15 @@
     xs_cfg.sid1Filter.fm = XS_SIDPLAY1_FM;
     xs_cfg.sid1Filter.ft = XS_SIDPLAY1_FT;
 
-#ifdef HAVE_SIDPLAY2
+#if defined(HAVE_SIDPLAY2)
     xs_cfg.playerEngine = XS_ENG_SIDPLAY2;
     xs_cfg.memoryMode = XS_MPU_REAL;
-#else
-#ifdef HAVE_SIDPLAY1
+#elif defined(HAVE_SIDPLAY1)
     xs_cfg.playerEngine = XS_ENG_SIDPLAY1;
     xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING;
 #else
 #error This should not happen! No emulator engines configured in!
 #endif
-#endif
 
     xs_cfg.clockSpeed = XS_CLOCK_PAL;
     xs_cfg.forceSpeed = FALSE;
@@ -239,16 +237,12 @@
     xs_cfg.sid2OptLevel = 0;
     xs_cfg.sid2NFilterPresets = 0;
 
-#ifdef HAVE_RESID_BUILDER
+#if defined(HAVE_RESID_BUILDER)
     xs_cfg.sid2Builder = XS_BLD_RESID;
-#else
-#ifdef HAVE_HARDSID_BUILDER
+#elif defined(HAVE_HARDSID_BUILDER)
     xs_cfg.sid2Builder = XS_BLD_HARDSID;
-#else
-#ifdef HAVE_SIDPLAY2
-#error This should not happen! No supported SIDPlay2 builders configured in!
-#endif
-#endif
+#elif defined(HAVE_SIDPLAY2)
+#  error This should not happen! No supported SIDPlay2 builders configured in!
 #endif
 
     xs_cfg.playMaxTimeEnable = FALSE;
@@ -1249,26 +1243,13 @@
 
     gtk_widget_set_sensitive(LUW("cfg_sidplay2_frame"), isActive);
 
-#ifdef HAVE_SIDPLAY2_DISTORTION
     /* Optimization mode removed from distortion patch */
-    gtk_widget_set_sensitive(LUW("cfg_emu_sp2_opt"), FALSE);
-#else
-    gtk_widget_set_sensitive(LUW("cfg_emu_sp2_opt"), isActive);
-#endif
+    gtk_widget_set_sensitive(LUW("cfg_emu_sp2_opt"), HAVE_SIDPLAY2_FP && isActive);
 
     gtk_widget_set_sensitive(LUW("cfg_chn_autopan"), !isActive);
 
-#ifdef HAVE_RESID_BUILDER
-    gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), isActive);
-#else
-    gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), FALSE);
-#endif
-
-#ifdef HAVE_HARDSID_BUILDER
-    gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), isActive);
-#else
-    gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), FALSE);
-#endif
+    gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), HAVE_RESID_BUILDER && isActive);
+    gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), HAVE_HARDSID_BUILDER && isActive);
 }