Merge the includes-revamp branch into trunk.

src/lib/buses/Makefile.am

@@ -1,6 +1,6 @@
 
 # set the include path found by configure
-INCLUDES= $(all_includes)
+INCLUDES= $(all_includes) $(LIBNFC_CFLAGS)
 
 noinst_HEADERS = uart.h
 noinst_LTLIBRARIES = libnfcbuses.la

src/lib/buses/uart.c

@@ -28,7 +28,7 @@ http://www.teuniz.net/RS-232/index.html
 
 #include "uart.h"
 
-#include "nfc-messages.h"
+#include <nfc/nfc-messages.h>
 
 // Test if we are dealing with unix operating systems
 #ifndef _WIN32

src/lib/buses/uart.h

@@ -29,7 +29,7 @@
 #include <stdlib.h>
 
 
-#include "nfc-types.h"
+#include <nfc/nfc-types.h>
 
 // Handle platform specific includes
 #ifndef _WIN32