Include "config.h" at the beginning of all source code, remove it from headers.

While here distinguish licence comments using the /*- special comment delimiter.

src/examples/doc/quick_start_example1.c

@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdlib.h>
 #include <nfc/nfc.h>
 

src/examples/nfc-anticol.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+/** 
  * @file nfc-anticol.c
  * @brief
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

src/examples/nfc-emulate.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+/**
  * @file nfc-emulate.c
  * @brief
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

src/examples/nfc-list.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
+ */
- * 
+
+/**
  * @file nfc-list.c
  * @brief
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #ifdef HAVE_LIBUSB
   #ifdef DEBUG
     #include <sys/param.h>

src/examples/nfc-mfclassic.c

@@ -22,6 +22,10 @@
  * @brief MIFARE Classic manipulation example
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

src/examples/nfc-mfultralight.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+/**
  * @file nfc-mfultool.c
  * @brief
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

src/examples/nfc-relay.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+/**
  * @file nfc-relay.c
  * @brief
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

src/examples/nfcip-initiator.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+/**
  * @file nfcip-initiator.c
  * @brief
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
 #include <string.h>
 #include <nfc/nfc.h>

src/examples/nfcip-target.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,18 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ *
- * 
+ */
+
+/**
  * @file nfcip-target.c
  * @brief
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
 #include <nfc/nfc.h>
 

src/lib/bitutils.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+ /**
  * @file bitutils.c
  * @brief
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
 
 #include "bitutils.h"

src/lib/buses/uart.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,8 +15,10 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ *
- * 
+ */
+
+/**
  * @file uart.c
  * @brief
  */
@@ -26,6 +28,10 @@ Based on RS232 code written by Teunis van Beelen available:
 http://www.teuniz.net/RS-232/index.html
 */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include "uart.h"
 
 #include <nfc/nfc-messages.h>

src/lib/chips/pn53x.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+/**
  * @file pn53x.h
  * @brief PN531, PN532 and PN533 common functions
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <string.h>
 #include <stdio.h>
 

src/lib/drivers.h

@@ -25,11 +25,6 @@
 #ifndef __NFC_DRIVERS_H__
 #define __NFC_DRIVERS_H__
 
-#ifdef HAVE_CONFIG_H
-  #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-
 #include <nfc/nfc-types.h>
 
 #ifdef HAVE_PCSC_LITE

src/lib/drivers/acr122.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+/**
  * @file acr122.c
  * @brief
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

src/lib/drivers/arygon.c

@@ -24,6 +24,11 @@
  * This driver can handle ARYGON readers that use UART as bus.
  * UART connection can be direct (host<->arygon_uc) or could be provided by internal USB to serial interface (e.g. host<->ftdi_chip<->arygon_uc)
  */
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include "../drivers.h"
 #include "../bitutils.h"
 

src/lib/drivers/pn531_usb.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,8 +15,9 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+/**
  * @file pn531_usb.c
  * @brief Driver for PN531 chip using USB
  */
@@ -25,6 +26,10 @@
 Thanks to d18c7db and Okko for example code
 */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdlib.h>
 
 #include "../drivers.h"

src/lib/drivers/pn532_uart.c

@@ -21,6 +21,11 @@
  * @file pn532_uart.c
  * @brief PN532 driver using UART bus (UART, RS232, etc.)
  */
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include "../drivers.h"
 #include "../bitutils.h"
 

src/lib/drivers/pn533_usb.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,8 +15,9 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+/**
  * @file pn533_usb.c
  * @brief Driver for PN533 chip using USB
  */
@@ -25,6 +26,10 @@
 Thanks to d18c7db and Okko for example code
 */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdlib.h>
 
 #include "../drivers.h"

src/lib/drivers/pn53x_usb.c

@@ -1,4 +1,4 @@
-/**
+/*-
  * Public platform independent Near Field Communication (NFC) library
  * 
  * Copyright (C) 2009, Roel Verdult
@@ -15,12 +15,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
+ */
- * 
+
+/**
  * @file pn53x_usb.c
  * @brief Driver common routines for PN53x chips using USB
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 /*
 Thanks to d18c7db and Okko for example code
 */

src/lib/nfc.c

@@ -15,7 +15,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
  */
  
 /** 
@@ -23,6 +22,10 @@
  * @brief NFC library implementation
  */
 
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -35,10 +38,6 @@
 
 #include <nfc/nfc-messages.h>
 
-#ifdef HAVE_CONFIG_H
-  #include "config.h"
-#endif // HAVE_CONFIG_H
-
 nfc_device_desc_t * nfc_pick_device (void);
 
 // PN53X configuration