diff --git a/configure.in b/configure.in
index 103bced8b..4dcc30ad7 100644
--- a/configure.in
+++ b/configure.in
@@ -548,7 +548,7 @@ CheckX11()
         AC_PATH_X
         AC_PATH_XTRA
         if test x$have_x = xyes; then
-            CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -I\$(top_srcdir)/include -I\$(top_srcdir)/src/video"
+            CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -I$srcdir/include -I$srcdir/src/video"
             if test x$ac_cv_func_shmat != xyes; then
                 CFLAGS="$CFLAGS -DNO_SHARED_MEMORY"
             fi
diff --git a/src/audio/mint/SDL_mintaudiointerrupt.S b/src/audio/mint/SDL_mintaudiointerrupt.S
index f10566af9..dc95469d1 100644
--- a/src/audio/mint/SDL_mintaudiointerrupt.S
+++ b/src/audio/mint/SDL_mintaudiointerrupt.S
@@ -30,14 +30,17 @@
 	.text
 _SDL_MintAudio_IntDma:
 
+	/* Reenable interrupts, so other interrupts can work */
+	movew	#0x2300,sr
+
+	/* Clear service bit, so other MFP interrupts can work */
+	bclr	#5,0xfffffa0f:w
+
 	/* Check if we are not already running */
 	tstw	_SDL_MintAudio_mutex
 	bnes	intdma_end
 	notw	_SDL_MintAudio_mutex
 	
-	/* Reenable interrupts */
-	movew	#0x2300,sr
-
 	/* Swap buffers */
 	moveml	d0-d1/a0-a1,sp@-
 
@@ -76,7 +79,6 @@ intdma_buffer0:
 
 	clrw	_SDL_MintAudio_mutex
 intdma_end:
-	bclr	#5,0xfffffa0f:w
 	rte
 
 /*--- Xbios interrupt vector ---*/
@@ -84,14 +86,17 @@ intdma_end:
 	.text
 _SDL_MintAudio_IntXbios:
 
+	/* Reenable interrupts, so other interrupts can work */
+	movew	#0x2300,sr
+
+	/* Clear service bit, so other MFP interrupts can work */
+	bclr	#5,0xfffffa0f:w
+
 	/* Check if we are not already running */
 	tstw	_SDL_MintAudio_mutex
 	bnes	intxbios_end
 	notw	_SDL_MintAudio_mutex
 	
-	/* Reenable interrupts */
-	movew	#0x2300,sr
-
 	/* Swap buffers */
 	moveml	d0-d2/a0-a2,sp@-
 
@@ -123,7 +128,6 @@ intxbios_buffer0:
 
 	clrw	_SDL_MintAudio_mutex
 intxbios_end:
-	bclr	#5,0xfffffa0f:w
 	rte
 
 /*--- GSXB interrupt vector ---*/