diff --git a/stream/Makefile b/stream/Makefile
index 87b9fc4a5e..4f52c72073 100644
--- a/stream/Makefile
+++ b/stream/Makefile
@@ -13,11 +13,10 @@ SRCS += cache2.c
 endif
 
 # Miscellaneous
-SRCS += cdinfo.c \
-        cue_read.c \
+SRCS += cue_read.c \
 
 ifeq ($(CDDA),yes)
-SRCS += stream_cdda.c
+SRCS += stream_cdda.c cdinfo.c
   ifeq ($(MPLAYER_NETWORK),yes)
   SRCS += stream_cddb.c
   endif
diff --git a/stream/cdinfo.c b/stream/cdinfo.c
index 8fd835439b..a5d160e6bc 100644
--- a/stream/cdinfo.c
+++ b/stream/cdinfo.c
@@ -6,8 +6,6 @@
 
 #include "config.h"
 
-#if defined(HAVE_CDDA) 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -133,5 +131,3 @@ cd_info_debug(cd_info_t *cd_info) {
 	}
 	printf("================ CD INFO ===  end  =========\n");
 }
-
-#endif