diff --git a/ChangeLog b/ChangeLog
index be9f3e679..6d2a40d2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+
+	* include/gphoto2-debug.h: #include <gphoto2-port-debug.h>
+	* include/gphoto2-result.h: #include <gphoto2-port-result.h>
+	* libgphoto2/debug.c: #include <gphoto2-port.h>
+
 2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/debug.c: Move debugging stuff to libgphoto2_port so
diff --git a/camlibs/konica/lowlevel.h b/camlibs/konica/lowlevel.h
index 34a209b48..3c78f25cb 100644
--- a/camlibs/konica/lowlevel.h
+++ b/camlibs/konica/lowlevel.h
@@ -18,6 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __KONICA_LOWLEVEL_H__
+#define __KONICA_LOWLEVEL_H__
+
+#include <gphoto2-port.h>
+
 int l_init (gp_port* device);
 
 /*
@@ -44,3 +49,5 @@ int l_send_receive (gp_port *device,
 	unsigned char **receive_buffer, unsigned int *receive_buffer_size,
 	unsigned int timeout,
 	unsigned char **image_buffer, unsigned int *image_buffer_size);
+
+#endif /* __KONICA_LOWLEVEL_H__ */
diff --git a/include/gphoto2-debug.h b/include/gphoto2-debug.h
index bc9b1af71..a1adeb5ec 100644
--- a/include/gphoto2-debug.h
+++ b/include/gphoto2-debug.h
@@ -21,9 +21,8 @@
 #ifndef __GPHOTO2_DEBUG_H__
 #define __GPHOTO2_DEBUG_H__
 
-#include <gphoto2-port.h>
-
-/* The debug levels (GP_DEBUG_*) are defined in gphoto2-port.h */
+/* The debug levels (GP_DEBUG_*) are defined here */
+#include <gphoto2-port-debug.h>
 
 void gp_debug_printf    (int level, const char *id, const char *format, ...);
 
diff --git a/include/gphoto2-result.h b/include/gphoto2-result.h
index 2fdeee755..321ae5975 100644
--- a/include/gphoto2-result.h
+++ b/include/gphoto2-result.h
@@ -22,7 +22,7 @@
 #define __GPHOTO2_RESULT_H__
 
 /* Additional error codes are defined here */
-#include <gphoto2-port.h>
+#include <gphoto2-port-result.h>
 
 #define GP_ERROR_BAD_PARAMETERS      -100 /* for checking function-param. */
 #define GP_ERROR_IO                  -101 /* IO problem                 */
diff --git a/libgphoto2/debug.c b/libgphoto2/debug.c
index 80b49fdcf..3c399ed7c 100644
--- a/libgphoto2/debug.c
+++ b/libgphoto2/debug.c
@@ -27,6 +27,7 @@
 
 #include <gphoto2-result.h>
 #include <gphoto2-port-debug.h>
+#include <gphoto2-port.h>
 
 static int glob_debug = GP_DEBUG_NONE;