6 files changed, 19 insertions, 18 deletions
diff --git a/camlibs/canon/canon.h b/camlibs/canon/canon.h
index 06cec2b3f..1bd41bdb2 100644
--- a/camlibs/canon/canon.h
+++ b/camlibs/canon/canon.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef _CANON_H
-#define _CANON_H
+#ifndef CAMLIBS_CANON_CANON_H
+#define CAMLIBS_CANON_CANON_H
 
 #ifdef CANON_EXPERIMENTAL_UPLOAD
 # ifdef __GCC__
@@ -738,7 +738,7 @@ int canon_int_extract_jpeg_thumb (unsigned char *data, const unsigned int datale
 /* for the macros abbreviating gp_log* */
 #define GP_MODULE "canon"
 
-#endif /* _CANON_H */
+#endif /* !defined(CAMLIBS_CANON_CANON_H) */
 
 /*
  * Local Variables:
diff --git a/camlibs/canon/crc.h b/camlibs/canon/crc.h
index 0e786ca8e..3c83183ca 100644
--- a/camlibs/canon/crc.h
+++ b/camlibs/canon/crc.h
@@ -1,7 +1,7 @@
-#ifndef CRC_H
-#define CRC_H
+#ifndef CAMLIBS_CANON_CRC_H
+#define CAMLIBS_CANON_CRC_H
 
 int canon_psa50_gen_crc(const unsigned char *pkt, int len);
 int canon_psa50_chk_crc(const unsigned char *pkt, int len, unsigned short crc);
 
-#endif
+#endif /* !defined(CAMLIBS_CANON_CRC_H) */
diff --git a/camlibs/canon/library.h b/camlibs/canon/library.h
index 794313c9c..477ae6928 100644
--- a/camlibs/canon/library.h
+++ b/camlibs/canon/library.h
@@ -4,8 +4,8 @@
  *
  ****************************************************************************/
 
-#ifndef _LIBRARY_H
-#define _LIBRARY_H
+#ifndef CAMLIBS_CANON_LIBRARY_H
+#define CAMLIBS_CANON_LIBRARY_H
 
 /****************************************************************************
  *
@@ -29,7 +29,7 @@ void clear_readiness(Camera *camera);
 
 #define GP_MODULE "canon"
 
-#endif /* _LIBRARY_H */
+#endif /* !defined(CAMLIBS_CANON_LIBRARY_H) */
 
 /****************************************************************************
  *
diff --git a/camlibs/canon/serial.h b/camlibs/canon/serial.h
index b4daaeed8..318a1b5cd 100644
--- a/camlibs/canon/serial.h
+++ b/camlibs/canon/serial.h
@@ -4,8 +4,8 @@
  *
  ****************************************************************************/
 
-#ifndef _SERIAL_H
-#define _SERIAL_H
+#ifndef CAMLIBS_CANON_SERIAL_H
+#define CAMLIBS_CANON_SERIAL_H
 
 /****************************************************************************
  *
@@ -312,7 +312,7 @@ typedef enum {
 
 
 
-#endif /* _SERIAL_H */
+#endif /* !defined(CAMLIBS_CANON_SERIAL_H) */
 
 /****************************************************************************
  *
diff --git a/camlibs/canon/usb.h b/camlibs/canon/usb.h
index 764b13737..19e559f04 100644
--- a/camlibs/canon/usb.h
+++ b/camlibs/canon/usb.h
@@ -4,8 +4,8 @@
  *
  ****************************************************************************/
 
-#ifndef _CANON_USB_H
-#define _CANON_USB_H
+#ifndef CAMLIBS_CANON_USB_H
+#define CAMLIBS_CANON_USB_H
 
 /**
  * USB_BULK_READ_SIZE
@@ -282,7 +282,8 @@ int canon_usb_ready (Camera *camera, GPContext *context);
 int canon_usb_wait_for_event (Camera *camera, int timeout,
 			CameraEventType *eventtype, void **eventdata,
 			GPContext *context);
-#endif /* _CANON_USB_H */
+
+#endif /* !defined(CAMLIBS_CANON_USB_H) */
 
 /****************************************************************************
  *
diff --git a/camlibs/canon/util.h b/camlibs/canon/util.h
index f95ccbab9..3439b47f0 100644
--- a/camlibs/canon/util.h
+++ b/camlibs/canon/util.h
@@ -4,8 +4,8 @@
  *
  ****************************************************************************/
 
-#ifndef _CANON_UTIL_H
-#define _CANON_UTIL_H
+#ifndef CAMLIBS_CANON_UTIL_H
+#define CAMLIBS_CANON_UTIL_H
 
 #include "gphoto2-endian.h"
 
@@ -33,7 +33,7 @@ int is_cr2 (const char *name);
 
 const char *filename2mimetype(const char *filename);
 
-#endif /* _CANON_UTIL_H */
+#endif /* !defined(CAMLIBS_CANON_UTIL_H) */
 
 /****************************************************************************
  *