Use consistent multiple inclusion guards everywhere:

Combine them from a LIBDVDREAD_ prefix and the filename.

msvc/config.h

 /* config.h.  Generated by hand.  */
 
+#ifndef LIBDVDREAD_CONFIG_H
+#define LIBDVDREAD_CONFIG_H
+
 #define HAVE_DLFCN_H 1
 /* #undef HAVE_DVDCSS_DVDCSS_H*/
 /* #undef HAVE_INTTYPES_H */
@@ -49,3 +52,5 @@ typedef signed int          int32_t;
 typedef unsigned __int64    uint64_t;
 typedef signed __int64      int64_t;
 typedef unsigned int        uintptr_t;
+
+#endif /* LIBDVDREAD_CONFIG_H */

msvc/include/dvdnav_internal.h

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef DVDNAV_INTERNAL_H_INCLUDED
-#define DVDNAV_INTERNAL_H_INCLUDED
+#ifndef LIBDVDREAD_DVDNAV_INTERNAL_H
+#define LIBDVDREAD_DVDNAV_INTERNAL_H
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -182,4 +182,4 @@ struct dvdnav_s {
 #define S_OK  DVDNAV_STATUS_OK
 #endif /* MSC_VER */
 
-#endif /* DVDNAV_INTERNAL_H_INCLUDED */
+#endif /* LIBDVDREAD_DVDNAV_INTERNAL_H */

src/bitreader.h

-#ifndef BITREADER_H_INCLUDED
-#define BITREADER_H_INCLUDED
-
 /*
  * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>.
  *
@@ -21,6 +18,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef LIBDVDREAD_BITREADER_H
+#define LIBDVDREAD_BITREADER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,4 +38,4 @@ uint32_t dvdread_getbits(getbits_state_t *state, uint32_t number_of_bits);
 #ifdef __cplusplus
 };
 #endif
-#endif /* BITREADER_H_INCLUDED */
+#endif /* LIBDVDREAD_BITREADER_H */

src/bswap.h

-#ifndef BSWAP_H_INCLUDED
-#define BSWAP_H_INCLUDED
-
 /*
  * Copyright (C) 2000, 2001 Billy Biggs <vektor@dumbterm.net>,
  *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
@@ -22,6 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef LIBDVDREAD_BSWAP_H
+#define LIBDVDREAD_BSWAP_H
+
 #include <config.h>
 
 #if defined(WORDS_BIGENDIAN)
@@ -103,4 +103,4 @@
 
 #endif /* WORDS_BIGENDIAN */
 
-#endif /* BSWAP_H_INCLUDED */
+#endif /* LIBDVDREAD_BSWAP_H */

src/dvd_input.h

-#ifndef DVD_INPUT_H_INCLUDED
-#define DVD_INPUT_H_INCLUDED
-
 /*
  * Copyright (C) 2001, 2002 Samuel Hocevar <sam@zoy.org>,
  *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
@@ -22,6 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef LIBDVDREAD_DVD_INPUT_H
+#define LIBDVDREAD_DVD_INPUT_H
+
 /**
  * Defines and flags.  Make sure they fit the libdvdcss API!
  */
@@ -47,4 +47,4 @@ extern char *      (*dvdinput_error) (dvd_input_t);
  */
 int dvdinput_setup(void);
 
-#endif /* DVD_INPUT_H_INCLUDED */
+#endif /* LIBDVDREAD_DVD_INPUT_H */

src/dvd_reader.h

-#ifndef DVD_READER_H_INCLUDED
-#define DVD_READER_H_INCLUDED
-
 /*
  * Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>,
  *                          Håkan Hjort <d95hjort@dtek.chalmers.se>,
@@ -23,6 +20,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef LIBDVDREAD_DVD_READER_H
+#define LIBDVDREAD_DVD_READER_H
+
 #ifdef _MSC_VER
 #include <config.h>
 
@@ -274,4 +274,4 @@ int DVDUDFCacheLevel( dvd_reader_t *, int );
 #ifdef __cplusplus
 };
 #endif
-#endif /* DVD_READER_H_INCLUDED */
+#endif /* LIBDVDREAD_DVD_READER_H */

src/dvd_udf.h

-#ifndef DVD_UDF_H_INCLUDED
-#define DVD_UDF_H_INCLUDED
-
 /*
  * This code is based on dvdudf by:
  *   Christian Wolff <scarabaeus@convergence.de>.
@@ -31,6 +28,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef LIBDVDREAD_DVD_UDF_H
+#define LIBDVDREAD_DVD_UDF_H
+
 #include <inttypes.h>
 
 #include "dvd_reader.h"
@@ -59,4 +59,4 @@ void SetUDFCacheHandle(dvd_reader_t *device, void *cache);
 #ifdef __cplusplus
 };
 #endif
-#endif /* DVD_UDF_H_INCLUDED */
+#endif /* LIBDVDREAD_DVD_UDF_H */

src/dvdread_internal.h

-#ifndef DVDREAD_INTERNAL_H
-#define DVDREAD_INTERNAL_H
+#ifndef LIBDVDREAD_DVDREAD_INTERNAL_H
+#define LIBDVDREAD_DVDREAD_INTERNAL_H
 
 #ifdef _MSC_VER
 #include <unistd.h>
@@ -12,4 +12,4 @@
                    __FILE__, __LINE__, # arg ); \
  }
 
-#endif /* DVDREAD_INTERNAL_H */
+#endif /* LIBDVDREAD_DVDREAD_INTERNAL_H */

src/ifo_print.h

@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef IFO_PRINT_H_INCLUDED
-#define IFO_PRINT_H_INCLUDED
+#ifndef LIBDVDREAD_IFO_PRINT_H
+#define LIBDVDREAD_IFO_PRINT_H
 
 #include <inttypes.h>
 #include "ifo_types.h"
@@ -28,7 +28,7 @@
 void ifo_print(dvd_reader_t *dvd, int title);
 void dvdread_print_time(dvd_time_t *dtime);
 
-#endif /* IFO_PRINT_H_INCLUDED */
+#endif /* LIBDVDREAD_IFO_PRINT_H */
 
 /*
  * $Log$

src/ifo_read.h

-#ifndef IFO_READ_H_INCLUDED
-#define IFO_READ_H_INCLUDED
-
 /*
  * Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn@dtek.chalmers.se>,
  *                                Håkan Hjort <d95hjort@dtek.chalmers.se>
@@ -22,6 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef LIBDVDREAD_IFO_READ_H
+#define LIBDVDREAD_IFO_READ_H
+
 #include "ifo_types.h"
 #include "dvd_reader.h"
 
@@ -226,4 +226,4 @@ void ifoFree_TXTDT_MGI(ifo_handle_t *);
 #ifdef __cplusplus
 };
 #endif
-#endif /* IFO_READ_H_INCLUDED */
+#endif /* LIBDVDREAD_IFO_READ_H */

src/ifo_types.h

-#ifndef IFO_TYPES_H_INCLUDED
-#define IFO_TYPES_H_INCLUDED
-
 /*
  * Copyright (C) 2000, 2001 Björn Englund <d4bjorn@dtek.chalmers.se>,
  *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
@@ -22,6 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef LIBDVDREAD_IFO_TYPES_H
+#define LIBDVDREAD_IFO_TYPES_H
+
 #include <inttypes.h>
 #include "dvd_reader.h"
 
@@ -746,4 +746,4 @@ typedef struct {
   vobu_admap_t   *vts_vobu_admap;
 } ifo_handle_t;
 
-#endif /* IFO_TYPES_H_INCLUDED */
+#endif /* LIBDVDREAD_IFO_TYPES_H */

src/md5.h

@@ -18,8 +18,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
-#ifndef _MD5_H
-#define _MD5_H 1
+#ifndef LIBDVDREAD_MD5_H
+#define LIBDVDREAD_MD5_H
 
 #include <stdio.h>
 
@@ -158,4 +158,4 @@ rol(md5_uint32 x, int n)
 # define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
 #endif
 
-#endif
+#endif /* LIBDVDREAD_MD5_H */

src/nav_print.h

-#ifndef NAV_PRINT_H_INCLUDED
-#define NAV_PRINT_H_INCLUDED
-
 /*
  * Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>,
  *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
@@ -22,6 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef LIBDVDREAD_NAV_PRINT_H
+#define LIBDVDREAD_NAV_PRINT_H
+
 #include "nav_types.h"
 
 /**
@@ -49,4 +49,4 @@ void navPrint_DSI(dsi_t *);
 #ifdef __cplusplus
 };
 #endif
-#endif /* NAV_PRINT_H_INCLUDED */
+#endif /* LIBDVDREAD_NAV_PRINT_H */

src/nav_read.h

-#ifndef NAV_READ_H_INCLUDED
-#define NAV_READ_H_INCLUDED
-
 /*
  * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>.
  *
@@ -21,6 +18,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef LIBDVDREAD_NAV_READ_H
+#define LIBDVDREAD_NAV_READ_H
+
 #include "nav_types.h"
 
 /**
@@ -50,4 +50,4 @@ void navRead_DSI(dsi_t *, unsigned char *);
 #ifdef __cplusplus
 };
 #endif
-#endif /* NAV_READ_H_INCLUDED */
+#endif /* LIBDVDREAD_NAV_READ_H */

src/nav_types.h

-#ifndef NAV_TYPES_H_INCLUDED
-#define NAV_TYPES_H_INCLUDED
-
 /*
  * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>
  *
@@ -28,6 +25,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef LIBDVDREAD_NAV_TYPES_H
+#define LIBDVDREAD_NAV_TYPES_H
+
 #include <inttypes.h>
 #include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */
 
@@ -245,4 +245,4 @@ typedef struct {
 #pragma pack()
 #endif
 
-#endif /* NAV_TYPES_H_INCLUDED */
+#endif /* LIBDVDREAD_NAV_TYPES_H */