config.h generated by autoheader should be included directly by the .cc files on not .h files, since it by default does not contain any guards.

Author: mywave82

src/adplay.cc

@@ -17,6 +17,8 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>

src/alsa.cc

@@ -17,6 +17,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
  */
 
+#include "config.h"
 #include "defines.h"
 #include "alsa.h"
 

src/defines.h

@@ -20,8 +20,6 @@
 #ifndef H_DEFINES
 #define H_DEFINES
 
-#include "config.h"
-
 /***** Defines *****/
 
 // AdPlay/UNIX version string

src/disk.cc

@@ -17,6 +17,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
  */
 
+#include "config.h"
 #include <iostream>
 #include <stdlib.h>
 #include <stdio.h>

src/esound.cc

@@ -17,6 +17,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <esd.h>

src/oss.cc

@@ -17,6 +17,8 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>

src/output.cc

@@ -17,6 +17,8 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <adplug/emuopl.h>
 #include <adplug/kemuopl.h>

src/players.h

@@ -25,8 +25,6 @@
 #ifndef H_PLAYERS
 #define H_PLAYERS
 
-#include "config.h"
-
 // Enumerate ALL outputs (regardless of availability)
 enum Outputs {none, null, ao, oss, disk, esound, qsa, sdl, alsa};
 

src/sdl.cc

@@ -17,6 +17,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
  */
 
+#include "config.h"
 #include <unistd.h>
 
 #include "sdl.h"