diff --git a/dsd/dsd.h b/dsd/dsd.h
index 5f4f062..5167bf1 100644
--- a/dsd/dsd.h
+++ b/dsd/dsd.h
@@ -15,7 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -28,20 +27,9 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
-#ifdef SOLARIS
-#include <sys/audioio.h>
-#endif
-#if defined(BSD) && !defined(__APPLE__)
-#include <sys/soundcard.h>
-#endif
 #include <math.h>
 #include <mbelib.h>
 #include <sndfile.h>
-/*
- * global variables
- */
-int exitflag;
-
 
 typedef struct
 {
@@ -252,7 +240,6 @@ extern void initState (dsd_state * state);
 void usage ();
 extern void liveScanner (dsd_opts * opts, dsd_state * state);
 void cleanupAndExit (dsd_opts * opts, dsd_state * state);
-void sigfun (int sig);
 int main (int argc, char **argv);
 void playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv);
 void processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char ambe_fr[4][24], char imbe7100_fr[7][24]);
diff --git a/dsd/dsd_frame_sync.c b/dsd/dsd_frame_sync.c
index 91ed884..1b06f07 100644
--- a/dsd/dsd_frame_sync.c
+++ b/dsd/dsd_frame_sync.c
@@ -792,10 +792,12 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
             }
         }
 
+#if 0
       if (exitflag == 1)
         {
           cleanupAndExit (opts, state);
         }
+#endif
 
       if (synctest_pos < 10200)
         {
diff --git a/dsd/dsd_main.c b/dsd/dsd_main.c
index 7740bf0..da0bda9 100644
--- a/dsd/dsd_main.c
+++ b/dsd/dsd_main.c
@@ -329,13 +329,6 @@ cleanupAndExit (dsd_opts * opts, dsd_state * state)
   exit (0);
 }
 
-void
-sigfun (int sig)
-{
-  exitflag = 1;
-  signal (SIGINT, SIG_DFL);
-}
-
 int
 main (int argc, char **argv)
 {
@@ -354,9 +347,6 @@ main (int argc, char **argv)
   initOpts (&opts);
   initState (&state);
 
-  exitflag = 0;
-  signal (SIGINT, sigfun);
-
   while ((c = getopt (argc, argv, "hep:qstv:z:i:o:d:g:nw:B:C:R:f:m:u:x:A:S:M:rl")) != -1)
     {
       opterr = 0;
diff --git a/dsd/dsd_mbe.c b/dsd/dsd_mbe.c
index a7984c1..07d96fe 100644
--- a/dsd/dsd_mbe.c
+++ b/dsd/dsd_mbe.c
@@ -62,10 +62,12 @@ playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv)
                   playSynthesizedVoice (opts, state);
                 }
             }
+#if 0
           if (exitflag == 1)
             {
               cleanupAndExit (opts, state);
             }
+#endif
         }
     }
 }