50 files changed, 112 insertions, 99 deletions
diff --git a/Makefile.am b/Makefile.am
index 9be3a9f42..ae3e0fe31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,11 +12,21 @@ SUBDIRS = @subdirs@ libgphoto2 camlibs tests po bindings packaging doc
 
 doc_DATA = AUTHORS COPYING README NEWS
 
-# Remove obsolete directory of copied/symlinked header files
-all-local:
-	if test -d gphoto2; then rm -f gphoto2/gphoto2*.h; rmdir gphoto2; fi
-clean-local:
-	if test -d gphoto2; then rm -f gphoto2/gphoto2*.h; rmdir gphoto2; fi
+nobase_include_HEADERS =	\
+	gphoto2/gphoto2.h		\
+	gphoto2/gphoto2-abilities-list.h\
+	gphoto2/gphoto2-camera.h	\
+	gphoto2/gphoto2-context.h	\
+	gphoto2/gphoto2-file.h		\
+	gphoto2/gphoto2-filesys.h	\
+	gphoto2/gphoto2-library.h	\
+	gphoto2/gphoto2-list.h		\
+	gphoto2/gphoto2-result.h	\
+	gphoto2/gphoto2-setting.h	\
+	gphoto2/gphoto2-version.h	\
+	gphoto2/gphoto2-widget.h
+
+DISTCLEANFILES = libgphoto2/gphoto2-endian.h
 
 # we use just ONE .PHONY target in order not to confuse automake
 
@@ -69,3 +79,21 @@ endif
 # released version
 cvs-tags: Makefile
 	@echo cvs tag "@PACKAGE@-$$(echo '@VERSION@' | sed -e 's/\./_/g' -e 's/rc/-rc/g')"
+
+
+
+# Compatibility for header inclusions.
+#
+# - Old code has -I/usr/include/gphoto2
+#   #include <gphoto2-camera.h>
+#
+# - New code has -I/usr/include
+#   #include <gphoto2/gphoto2-camera.h>
+
+install-data-local:
+	rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(includedir)/gphoto2
+	$(LN_S) . $(DESTDIR)$(includedir)/gphoto2/gphoto2
+
+uninstall-local:
+	rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2
diff --git a/NEWS b/NEWS
index fdec5a5d4..9daebcd49 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-libgphoto2 TRUNK
+libgphoto2 2.2.1.5.trunk
 
 PTP:
    * Improved Nikon remote control
@@ -42,6 +42,7 @@ libgphoto2 API:
 libgphoto2:
    * Improved error checking and propagation.
    * New error code for "fixed limit exceeded" (exceptions would be nice)
+   * Added a few internal functions.
 
 ----------------------------------------------------------------------------
 
diff --git a/camlibs/canon/util.h b/camlibs/canon/util.h
index 3f4124e12..e0f22243f 100644
--- a/camlibs/canon/util.h
+++ b/camlibs/canon/util.h
@@ -8,7 +8,7 @@
 #ifndef _CANON_UTIL_H
 #define _CANON_UTIL_H
 
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #ifndef TRUE
 #define TRUE 1
diff --git a/camlibs/dimera/mesalib.c b/camlibs/dimera/mesalib.c
index dd35368c8..426c5d0fc 100644
--- a/camlibs/dimera/mesalib.c
+++ b/camlibs/dimera/mesalib.c
@@ -30,7 +30,7 @@
 #include <string.h>
 
 #include <gphoto2/gphoto2.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #define GP_MODULE "dimera"
 #define debuglog(e) GP_DEBUG( "%s", (e))
diff --git a/camlibs/enigma13/enigma13.c b/camlibs/enigma13/enigma13.c
index 15c34a41c..dee2143e0 100644
--- a/camlibs/enigma13/enigma13.c
+++ b/camlibs/enigma13/enigma13.c
@@ -29,7 +29,7 @@
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-result.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #ifdef ENABLE_NLS
 #  include <libintl.h>
diff --git a/camlibs/gsmart300/gsmart300.c b/camlibs/gsmart300/gsmart300.c
index d076cbdb3..4e2bb287a 100644
--- a/camlibs/gsmart300/gsmart300.c
+++ b/camlibs/gsmart300/gsmart300.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <gphoto2/gphoto2.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #include "gsmart300.h"
 #include "gsmart300-jpeg-header.h"
diff --git a/camlibs/kodak/dc240/library.c b/camlibs/kodak/dc240/library.c
index 0ee3605c2..a490f2e54 100644
--- a/camlibs/kodak/dc240/library.c
+++ b/camlibs/kodak/dc240/library.c
@@ -12,7 +12,7 @@
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #include "dc240.h"
 #include "library.h"
diff --git a/camlibs/kodak/dc240/library.h b/camlibs/kodak/dc240/library.h
index 5852ec1f4..8b8606710 100644
--- a/camlibs/kodak/dc240/library.h
+++ b/camlibs/kodak/dc240/library.h
@@ -9,7 +9,7 @@
 #define DC240_ACTION_IMAGE      (uint8_t)0x9A
 #define DC240_ACTION_DELETE     (uint8_t)0x9D
 
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 
 const char *dc240_convert_type_to_camera (uint16_t type);
diff --git a/camlibs/largan/lmini/lmini.c b/camlibs/largan/lmini/lmini.c
index 6b929b5e9..3eed8f186 100644
--- a/camlibs/largan/lmini/lmini.c
+++ b/camlibs/largan/lmini/lmini.c
@@ -28,7 +28,7 @@
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #include "lmini.h"
 #include "lmini_ccd.h"
diff --git a/camlibs/largan/lmini/lmini.h b/camlibs/largan/lmini/lmini.h
index b73cce35c..674577868 100644
--- a/camlibs/largan/lmini/lmini.h
+++ b/camlibs/largan/lmini/lmini.h
@@ -24,7 +24,7 @@
 #define _LARGAN_LIBRARY_H_
 
 #include <gphoto2/gphoto2.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 
 typedef enum {
diff --git a/camlibs/mars/mars.c b/camlibs/mars/mars.c
index 229834a68..d3a56a236 100644
--- a/camlibs/mars/mars.c
+++ b/camlibs/mars/mars.c
@@ -28,7 +28,7 @@
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #include "mars.h"
 
diff --git a/camlibs/panasonic/l859/l859.c b/camlibs/panasonic/l859/l859.c
index 796f559c8..c61a9d1f3 100644
--- a/camlibs/panasonic/l859/l859.c
+++ b/camlibs/panasonic/l859/l859.c
@@ -36,7 +36,7 @@
 #  define N_(String) (String)
 #endif
 
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-library.h>
 
diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h
index 7eb6ab66d..93dda3297 100644
--- a/camlibs/ptp2/ptp.h
+++ b/camlibs/ptp2/ptp.h
@@ -24,7 +24,7 @@
 #include <stdarg.h>
 #include <time.h>
 #include <iconv.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 /* PTP datalayer byteorder */
 
diff --git a/camlibs/soundvision/agfa_cl18.c b/camlibs/soundvision/agfa_cl18.c
index 35e7b38b4..beb8bf07f 100644
--- a/camlibs/soundvision/agfa_cl18.c
+++ b/camlibs/soundvision/agfa_cl18.c
@@ -17,7 +17,7 @@
 #endif
 
 #include <gphoto2/gphoto2.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #include "soundvision.h"
 #include "commands.h"
diff --git a/camlibs/soundvision/commands.c b/camlibs/soundvision/commands.c
index 43cddc5ec..9b84127aa 100644
--- a/camlibs/soundvision/commands.c
+++ b/camlibs/soundvision/commands.c
@@ -18,7 +18,7 @@
 #endif
 
 #include <gphoto2/gphoto2.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #include "soundvision.h"
 #include "commands.h"
diff --git a/camlibs/soundvision/tiger_fastflicks.c b/camlibs/soundvision/tiger_fastflicks.c
index 43b50ccfe..3dddcd334 100644
--- a/camlibs/soundvision/tiger_fastflicks.c
+++ b/camlibs/soundvision/tiger_fastflicks.c
@@ -31,7 +31,7 @@
 #endif
 
 #include <gphoto2/gphoto2.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #include "soundvision.h"
 #include "commands.h"
diff --git a/camlibs/spca50x/spca50x-flash.c b/camlibs/spca50x/spca50x-flash.c
index 211aceb95..1e41a8f9d 100644
--- a/camlibs/spca50x/spca50x-flash.c
+++ b/camlibs/spca50x/spca50x-flash.c
@@ -34,7 +34,7 @@
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 #include <gphoto2/gphoto2-port-log.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #define GP_MODULE "spca50x"
 #include "spca50x.h"
diff --git a/camlibs/spca50x/spca50x-sdram.c b/camlibs/spca50x/spca50x-sdram.c
index 7c42cda07..9d0adf10e 100644
--- a/camlibs/spca50x/spca50x-sdram.c
+++ b/camlibs/spca50x/spca50x-sdram.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <gphoto2/gphoto2.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #include "spca50x.h"
 #include "spca50x-sdram.h"
diff --git a/camlibs/spca50x/spca50x.c b/camlibs/spca50x/spca50x.c
index 969d5ed0d..3b88919b3 100644
--- a/camlibs/spca50x/spca50x.c
+++ b/camlibs/spca50x/spca50x.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <gphoto2/gphoto2.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #include "spca50x.h"
 #include "spca50x-registers.h"
diff --git a/camlibs/sx330z/sx330z.c b/camlibs/sx330z/sx330z.c
index b38bd2e90..d1f3b2fd0 100644
--- a/camlibs/sx330z/sx330z.c
+++ b/camlibs/sx330z/sx330z.c
@@ -29,7 +29,7 @@
 /* strncmp */
 #include <string.h>
 
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 /*convert to correct endianness */
 int 
diff --git a/camlibs/toshiba/pdrm11/pdrm11.c b/camlibs/toshiba/pdrm11/pdrm11.c
index 4d6d2407e..c0a7cb2f0 100644
--- a/camlibs/toshiba/pdrm11/pdrm11.c
+++ b/camlibs/toshiba/pdrm11/pdrm11.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
-#include <gphoto2/gphoto2-endian.h>
+#include "gphoto2-endian.h"
 
 #define	GP_MODULE	"pdrm11"
 #define	ETIMEDOUT	110
diff --git a/configure.ac b/configure.ac
index 660a11e33..53e16d788 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,11 +6,14 @@ dnl       So lastversion.X.trunk for instance. Bump X if necessary.
 
 dnl ******* THE NEXT RELEASE VERSION MUST BE 2.2.2 at least or higher!
 AC_INIT([libgphoto2], [2.2.1.5.trunk], [gphoto-devel@lists.sourceforge.net], [libgphoto2])
-AC_CONFIG_SRCDIR([libgphoto2/gphoto2/gphoto2.h])
+AC_CONFIG_SRCDIR([libgphoto2/gphoto2-version.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4m])
 AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2])
+dnl Working around bug in automake <= 1.9.6::
+dnl  - Please do not add filename-length-max=99 here.
+dnl  - Otherwise "make distdist" will fail in gphoto-suite
+AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 check-news])
 
 GP_CHECK_SHELL_ENVIRONMENT
 GP_CONFIG_MSG([Build])
@@ -56,7 +59,7 @@ dnl C only would be CFLAGS, C++ only CXXFLAGS
 AM_CPPFLAGS="$CPPFLAGS"
 
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)"
-AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/libgphoto2_port/libgphoto2_port"
+AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_builddir)"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/libgphoto2_port"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/libgphoto2"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_builddir)/libgphoto2"
@@ -303,7 +306,7 @@ dnl that will always be available
 AX_NEED_STDINT_H([libgphoto2/_stdint.h])
 
 dnl Create a header file containing NetBSD-style byte swapping macros
-AC_NEED_BYTEORDER_H(libgphoto2/gphoto2/gphoto2-endian.h)
+AC_NEED_BYTEORDER_H([libgphoto2/gphoto2-endian.h])
 
 
 dnl ---------------------------------------------------------------------------
diff --git a/libgphoto2/gphoto2/gphoto2-abilities-list.h b/gphoto2/gphoto2-abilities-list.h
index 8e1d29639..8e1d29639 100644
--- a/libgphoto2/gphoto2/gphoto2-abilities-list.h
+++ b/gphoto2/gphoto2-abilities-list.h
diff --git a/libgphoto2/gphoto2/gphoto2-camera.h b/gphoto2/gphoto2-camera.h
index 733f843d7..733f843d7 100644
--- a/libgphoto2/gphoto2/gphoto2-camera.h
+++ b/gphoto2/gphoto2-camera.h
diff --git a/libgphoto2/gphoto2/gphoto2-context.h b/gphoto2/gphoto2-context.h
index 07f7c7acd..07f7c7acd 100644
--- a/libgphoto2/gphoto2/gphoto2-context.h
+++ b/gphoto2/gphoto2-context.h
diff --git a/libgphoto2/gphoto2/gphoto2-file.h b/gphoto2/gphoto2-file.h
index 0416a9540..0416a9540 100644
--- a/libgphoto2/gphoto2/gphoto2-file.h
+++ b/gphoto2/gphoto2-file.h
diff --git a/libgphoto2/gphoto2/gphoto2-filesys.h b/gphoto2/gphoto2-filesys.h
index e9ba68fbd..e9ba68fbd 100644
--- a/libgphoto2/gphoto2/gphoto2-filesys.h
+++ b/gphoto2/gphoto2-filesys.h
diff --git a/libgphoto2/gphoto2/gphoto2-library.h b/gphoto2/gphoto2-library.h
index e172cbb93..e172cbb93 100644
--- a/libgphoto2/gphoto2/gphoto2-library.h
+++ b/gphoto2/gphoto2-library.h
diff --git a/libgphoto2/gphoto2/gphoto2-list.h b/gphoto2/gphoto2-list.h
index ca30532de..ca30532de 100644
--- a/libgphoto2/gphoto2/gphoto2-list.h
+++ b/gphoto2/gphoto2-list.h
diff --git a/libgphoto2/gphoto2/gphoto2-result.h b/gphoto2/gphoto2-result.h
index a80c81fc5..a80c81fc5 100644
--- a/libgphoto2/gphoto2/gphoto2-result.h
+++ b/gphoto2/gphoto2-result.h
diff --git a/libgphoto2/gphoto2/gphoto2-setting.h b/gphoto2/gphoto2-setting.h
index cbf27f8c0..cbf27f8c0 100644
--- a/libgphoto2/gphoto2/gphoto2-setting.h
+++ b/gphoto2/gphoto2-setting.h
diff --git a/libgphoto2/gphoto2/gphoto2-version.h b/gphoto2/gphoto2-version.h
index 16abf52e3..16abf52e3 100644
--- a/libgphoto2/gphoto2/gphoto2-version.h
+++ b/gphoto2/gphoto2-version.h
diff --git a/libgphoto2/gphoto2/gphoto2-widget.h b/gphoto2/gphoto2-widget.h
index 1b670168e..1b670168e 100644
--- a/libgphoto2/gphoto2/gphoto2-widget.h
+++ b/gphoto2/gphoto2-widget.h
diff --git a/libgphoto2/gphoto2/gphoto2.h b/gphoto2/gphoto2.h
index 825266427..825266427 100644
--- a/libgphoto2/gphoto2/gphoto2.h
+++ b/gphoto2/gphoto2.h
diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am
index edb85514d..2cc9216fc 100644
--- a/libgphoto2/Makefile.am
+++ b/libgphoto2/Makefile.am
@@ -48,43 +48,13 @@ libgphoto2_la_LIBADD =					\
 #	"-dlopen" $(top_builddir)/camlibs/ptp2/....la
 
 libgphoto2_la_DEPENDENCIES = \
-	gphoto2/gphoto2-version.h	\
+	$(top_srcdir)/gphoto2/gphoto2-version.h	\
 	$(srcdir)/libgphoto2.sym \
 	$(LIBLTDL)
 
-nobase_include_HEADERS =	\
-	gphoto2/gphoto2.h		\
-	gphoto2/gphoto2-abilities-list.h\
-	gphoto2/gphoto2-camera.h	\
-	gphoto2/gphoto2-context.h	\
-	gphoto2/gphoto2-file.h		\
-	gphoto2/gphoto2-filesys.h	\
-	gphoto2/gphoto2-library.h	\
-	gphoto2/gphoto2-list.h		\
-	gphoto2/gphoto2-result.h	\
-	gphoto2/gphoto2-setting.h	\
-	gphoto2/gphoto2-version.h	\
-	gphoto2/gphoto2-widget.h
-
 pkgconfig_DATA = libgphoto2.pc
 
 EXTRA_DIST = libgphoto2.pc.in gphoto2-library.c libgphoto2.sym
 
-DISTCLEANFILES = _stdint.h gphoto2/gphoto2-endian.h
-
-
-# Compatibility for header inclusions.
-#
-# - Old code has -I/usr/include/gphoto2
-#   #include <gphoto2-camera.h>
-#
-# - New code has -I/usr/include
-#   #include <gphoto2/gphoto2-camera.h>
-
-install-data-local:
-	rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2
-	$(INSTALL) -m 0755 -d $(DESTDIR)$(includedir)/gphoto2
-	$(LN_S) . $(DESTDIR)$(includedir)/gphoto2/gphoto2
+DISTCLEANFILES = _stdint.h
 
-uninstall-local:
-	rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2
diff --git a/libgphoto2_port/Makefile.am b/libgphoto2_port/Makefile.am
index d4c5a6678..a69cf091b 100644
--- a/libgphoto2_port/Makefile.am
+++ b/libgphoto2_port/Makefile.am
@@ -22,3 +22,31 @@ EXTRA_DIST =   		\
 doc_DATA = AUTHORS README NEWS
 
 ACLOCAL_AMFLAGS = -I m4
+
+# ship headers
+nobase_include_HEADERS =	\
+	gphoto2/gphoto2-port.h			\
+	gphoto2/gphoto2-port-info-list.h	\
+	gphoto2/gphoto2-port-log.h		\
+	gphoto2/gphoto2-port-version.h		\
+	gphoto2/gphoto2-port-portability.h	\
+	gphoto2/gphoto2-port-result.h
+
+EXTRA_DIST += gphoto2/gphoto2-port-library.h
+
+
+# Compatibility for header inclusions.
+#
+# - Old code has -I/usr/include/gphoto2
+#   #include <gphoto2-camera.h>
+#
+# - New code has -I/usr/include
+#   #include <gphoto2/gphoto2-camera.h>
+
+install-data-local:
+	rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(includedir)/gphoto2
+	$(LN_S) . $(DESTDIR)$(includedir)/gphoto2/gphoto2
+
+uninstall-local:
+	rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2
diff --git a/libgphoto2_port/NEWS b/libgphoto2_port/NEWS
index e69de29bb..71d63f754 100644
--- a/libgphoto2_port/NEWS
+++ b/libgphoto2_port/NEWS
@@ -0,0 +1,3 @@
+libgphoto2_port 0.7.0
+
+   * Added a few internal functions.
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
index f4ba06aee..ab225bf97 100644
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -1,11 +1,14 @@
 dnl Process this file with autoreconf to produce a configure script.
 AC_PREREQ(2.59)
 AC_INIT([libgphoto2 port access library], [0.7.0], [gphoto-devel@lists.sourceforge.net], [libgphoto2_port])
-AC_CONFIG_SRCDIR([libgphoto2_port/gphoto2/gphoto2-port.h])
+AC_CONFIG_SRCDIR([libgphoto2_port/gphoto2-port-version.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2])
+dnl Working around bug in automake <= 1.9.6:
+dnl  - Please do not add filename-length-max=99 here.
+dnl  - Otherwise "make distdist" will fail in gphoto-suite
+AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 check-news])
 
 
 dnl ---------------------------------------------------------------------------
@@ -75,7 +78,6 @@ AC_DEFINE_UNQUOTED(HAVE_CC,"$CC",[The C compiler we're using])
 
 AM_CPPFLAGS="$CPPFLAGS"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)"
-AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/libgphoto2_port"
 
 
 # ----------------------------------------------------------------------
diff --git a/libgphoto2_port/disk/Makefile.am b/libgphoto2_port/disk/Makefile.am
index 3a0907ac6..a3cb947c4 100644
--- a/libgphoto2_port/disk/Makefile.am
+++ b/libgphoto2_port/disk/Makefile.am
@@ -6,8 +6,10 @@ disk_la_LDFLAGS = -module -no-undefined -avoid-version \
 	-export-dynamic \
         -export-symbols $(top_srcdir)/iolib.sym
 disk_la_CPPFLAGS = \
-	-I$(top_srcdir)/libgphoto2_port $(INTL_CFLAGS) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(LIBUSB_CFLAGS) $(HAL_CFLAGS)
+	$(INTL_CFLAGS) \
+	$(AM_CPPFLAGS) \
+	$(LIBUSB_CFLAGS) $(HAL_CFLAGS) \
+	$(CPPFLAGS)
 disk_la_DEPENDENCIES = $(top_srcdir)/iolib.sym
 disk_la_LIBADD = \
 	$(top_builddir)/libgphoto2_port/libgphoto2_port.la \
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-info-list.h b/libgphoto2_port/gphoto2/gphoto2-port-info-list.h
index 3505b7132..3505b7132 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-info-list.h
+++ b/libgphoto2_port/gphoto2/gphoto2-port-info-list.h
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-library.h b/libgphoto2_port/gphoto2/gphoto2-port-library.h
index ea1fc98f4..ea1fc98f4 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-library.h
+++ b/libgphoto2_port/gphoto2/gphoto2-port-library.h
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-log.h b/libgphoto2_port/gphoto2/gphoto2-port-log.h
index ddf79e0b1..ddf79e0b1 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-log.h
+++ b/libgphoto2_port/gphoto2/gphoto2-port-log.h
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-portability.h b/libgphoto2_port/gphoto2/gphoto2-port-portability.h
index 7f6ec3a0e..7f6ec3a0e 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-portability.h
+++ b/libgphoto2_port/gphoto2/gphoto2-port-portability.h
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-result.h b/libgphoto2_port/gphoto2/gphoto2-port-result.h
index 427837df5..427837df5 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-result.h
+++ b/libgphoto2_port/gphoto2/gphoto2-port-result.h
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-version.h b/libgphoto2_port/gphoto2/gphoto2-port-version.h
index 8a11735ed..8a11735ed 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-version.h
+++ b/libgphoto2_port/gphoto2/gphoto2-port-version.h
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port.h b/libgphoto2_port/gphoto2/gphoto2-port.h
index 5645bf298..5645bf298 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port.h
+++ b/libgphoto2_port/gphoto2/gphoto2-port.h
diff --git a/libgphoto2_port/libgphoto2_port/Makefile.am b/libgphoto2_port/libgphoto2_port/Makefile.am
index 75bf07e5e..7248b9905 100644
--- a/libgphoto2_port/libgphoto2_port/Makefile.am
+++ b/libgphoto2_port/libgphoto2_port/Makefile.am
@@ -46,26 +46,16 @@ libgphoto2_port_la_SOURCES =		\
 	gphoto2-port-result.c
 
 libgphoto2_port_la_DEPENDENCIES = \
-	gphoto2/gphoto2-port-version.h		\
-	gphoto2/gphoto2-port-library.h		\
+	$(top_srcdir)/gphoto2/gphoto2-port-version.h		\
+	$(top_srcdir)/gphoto2/gphoto2-port-library.h		\
 	$(LIBLTDL) \
 	$(srcdir)/libgphoto2_port.sym
 
-# ship headers
-nobase_include_HEADERS =	\
-	gphoto2/gphoto2-port.h			\
-	gphoto2/gphoto2-port-info-list.h	\
-	gphoto2/gphoto2-port-log.h		\
-	gphoto2/gphoto2-port-version.h		\
-	gphoto2/gphoto2-port-portability.h	\
-	gphoto2/gphoto2-port-result.h
-
 # Note: If you have problem with this file not being put into
 #       the source tarball correctly at "make dist", this may
 #       be the result of tar not creating archives with >99
 #       characters of path length.
 EXTRA_DIST = \
-	gphoto2/gphoto2-port-library.h \
 	libgphoto2_port.sym libgphoto2_port.pc.in
 
 pkgconfig_DATA = libgphoto2_port.pc
@@ -73,19 +63,3 @@ pkgconfig_DATA = libgphoto2_port.pc
 ../libltdl/libltdlc.la:
 	cd ../libltdl && $(MAKE) libltdlc.la
 
-
-# Compatibility for header inclusions.
-#
-# - Old code has -I/usr/include/gphoto2
-#   #include <gphoto2-camera.h>
-#
-# - New code has -I/usr/include
-#   #include <gphoto2/gphoto2-camera.h>
-
-install-data-local:
-	rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2
-	$(INSTALL) -m 0755 -d $(DESTDIR)$(includedir)/gphoto2
-	$(LN_S) . $(DESTDIR)$(includedir)/gphoto2/gphoto2
-
-uninstall-local:
-	rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2
diff --git a/libgphoto2_port/ptpip/Makefile.am b/libgphoto2_port/ptpip/Makefile.am
index e1d10dec3..945401d33 100644
--- a/libgphoto2_port/ptpip/Makefile.am
+++ b/libgphoto2_port/ptpip/Makefile.am
@@ -6,8 +6,9 @@ ptpip_la_LDFLAGS = -module -no-undefined -avoid-version \
 	-export-dynamic \
         -export-symbols $(top_srcdir)/iolib.sym
 ptpip_la_CPPFLAGS = \
-	-I$(top_srcdir)/libgphoto2_port $(INTL_CFLAGS) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(LIBUSB_CFLAGS) $(HAL_CFLAGS)
+	$(INTL_CFLAGS) \
+	$(AM_CPPFLAGS) \
+	$(CPPFLAGS) 
 ptpip_la_DEPENDENCIES = $(top_srcdir)/iolib.sym
 ptpip_la_LIBADD = $(top_builddir)/libgphoto2_port/libgphoto2_port.la @MDNS_LIBS@
 ptpip_la_SOURCES = ptpip.c
diff --git a/libgphoto2_port/serial/Makefile.am b/libgphoto2_port/serial/Makefile.am
index 6a36f77bf..d082b5ebf 100644
--- a/libgphoto2_port/serial/Makefile.am
+++ b/libgphoto2_port/serial/Makefile.am
@@ -4,7 +4,7 @@ iolib_LTLIBRARIES = serial.la
 serial_la_LDFLAGS = -module -no-undefined -avoid-version \
 	-export-dynamic \
         -export-symbols $(top_srcdir)/iolib.sym
-serial_la_CPPFLAGS = -I$(top_srcdir)/libgphoto2_port $(INTL_CFLAGS)
+serial_la_CPPFLAGS = $(AM_CPPFLAGS) $(INTL_CFLAGS) $(CPPFLAGS)
 serial_la_DEPENDENCIES = $(top_srcdir)/iolib.sym
 serial_la_LIBADD =				\
 	$(top_builddir)/libgphoto2_port/libgphoto2_port.la	\
diff --git a/libgphoto2_port/usb/Makefile.am b/libgphoto2_port/usb/Makefile.am
index 7057def34..5b115aba7 100644
--- a/libgphoto2_port/usb/Makefile.am
+++ b/libgphoto2_port/usb/Makefile.am
@@ -6,8 +6,9 @@ usb_la_LDFLAGS = -module -no-undefined -avoid-version \
 	-export-dynamic \
         -export-symbols $(top_srcdir)/iolib.sym
 usb_la_CPPFLAGS = \
-	-I$(top_srcdir)/libgphoto2_port $(INTL_CFLAGS) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(LIBUSB_CFLAGS)
+	$(INTL_CFLAGS) \
+	$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
+	$(CPPFLAGS)
 usb_la_DEPENDENCIES = $(top_srcdir)/iolib.sym
 usb_la_LIBADD = \
 	$(LIBUSB_LIBS)			\