13 files changed, 28 insertions, 37 deletions
diff --git a/lib/libdvd/libdvdnav/msvc/config.h b/lib/libdvd/libdvdnav/msvc/config.h
index c6c6f94dc3..25f68fbef1 100755
--- a/lib/libdvd/libdvdnav/msvc/config.h
+++ b/lib/libdvd/libdvdnav/msvc/config.h
@@ -1,5 +1,8 @@
 /* config.h.  Generated by hand.  */
 
+#ifndef LIBDVNAV_CONFIG_H
+#define LIBDVNAV_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 /* LIBDVNAV_CONFIG_H */
diff --git a/lib/libdvd/libdvdnav/msvc/contrib/dlfcn.c b/lib/libdvd/libdvdnav/msvc/contrib/dlfcn.c
index 3eb996bd13..3a00045057 100755
--- a/lib/libdvd/libdvdnav/msvc/contrib/dlfcn.c
+++ b/lib/libdvd/libdvdnav/msvc/contrib/dlfcn.c
@@ -1,7 +1,4 @@
 /*
- * $Id: dlfcn.c 1135 2008-09-06 21:55:51Z rathann $
- * $Name$
- *
  * Adopted from Apache DSO code.
  * Portions copyright Apache Software Foundation
  *
diff --git a/lib/libdvd/libdvdnav/msvc/contrib/getopt.c b/lib/libdvd/libdvdnav/msvc/contrib/getopt.c
index 4b3ce3db40..b4634e10a2 100755
--- a/lib/libdvd/libdvdnav/msvc/contrib/getopt.c
+++ b/lib/libdvd/libdvdnav/msvc/contrib/getopt.c
@@ -21,8 +21,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+   Floor, Boston, MA 02110-1301 USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */
diff --git a/lib/libdvd/libdvdnav/msvc/contrib/timer/timer.c b/lib/libdvd/libdvdnav/msvc/contrib/timer/timer.c
index 60efe86db9..f99a73b3ed 100755
--- a/lib/libdvd/libdvdnav/msvc/contrib/timer/timer.c
+++ b/lib/libdvd/libdvdnav/msvc/contrib/timer/timer.c
@@ -14,8 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * WIN32 PORT,
  * by Matthew Grooms <elon@altavista.com>
diff --git a/lib/libdvd/libdvdnav/msvc/include/dlfcn.h b/lib/libdvd/libdvdnav/msvc/include/dlfcn.h
index 7a2416c843..b5fe376c34 100755
--- a/lib/libdvd/libdvdnav/msvc/include/dlfcn.h
+++ b/lib/libdvd/libdvdnav/msvc/include/dlfcn.h
@@ -1,11 +1,6 @@
 #ifndef __DLFCN_H__
 # define __DLFCN_H__
-/*
- * $Id: dlfcn.h 1135 2008-09-06 21:55:51Z rathann $
- * $Name$
- *
- *
- */
+
 extern void *dlopen  (const char *file, int mode);
 extern int   dlclose (void *handle);
 extern void *dlsym   (void * handle, const char * name);
diff --git a/lib/libdvd/libdvdnav/msvc/include/dvdnav_internal.h b/lib/libdvd/libdvdnav/msvc/include/dvdnav_internal.h
index cee785472e..72f8393faf 100644
--- a/lib/libdvd/libdvdnav/msvc/include/dvdnav_internal.h
+++ b/lib/libdvd/libdvdnav/msvc/include/dvdnav_internal.h
@@ -14,16 +14,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- *
- * $Id: dvdnav_internal.h 1135 2008-09-06 21:55:51Z rathann $
- *
+ * You should have received a copy of the GNU General Public License along
+ * with libdvdnav; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef DVDNAV_INTERNAL_H_INCLUDED
-#define DVDNAV_INTERNAL_H_INCLUDED
+#ifndef LIBDVDNAV_DVDNAV_INTERNAL_H
+#define LIBDVDNAV_DVDNAV_INTERNAL_H
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -182,4 +179,4 @@ struct dvdnav_s {
 #define S_OK  DVDNAV_STATUS_OK
 #endif /* MSC_VER */
 
-#endif /* DVDNAV_INTERNAL_H_INCLUDED */
+#endif /* LIBDVDNAV_DVDNAV_INTERNAL_H */
diff --git a/lib/libdvd/libdvdnav/msvc/include/getopt.h b/lib/libdvd/libdvdnav/msvc/include/getopt.h
index 2fa12f7baf..5f4643aa9c 100755
--- a/lib/libdvd/libdvdnav/msvc/include/getopt.h
+++ b/lib/libdvd/libdvdnav/msvc/include/getopt.h
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+   Floor, Boston, MA 02110-1301 USA.  */
 
 #ifndef _GETOPT_H
 #define _GETOPT_H 1
diff --git a/lib/libdvd/libdvdnav/msvc/include/inttypes.h b/lib/libdvd/libdvdnav/msvc/include/inttypes.h
index 55fd6a33e0..4e1cbe1efe 100755
--- a/lib/libdvd/libdvdnav/msvc/include/inttypes.h
+++ b/lib/libdvd/libdvdnav/msvc/include/inttypes.h
@@ -14,8 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * WIN32 PORT,
  * by Matthew Grooms <elon@altavista.com>
diff --git a/lib/libdvd/libdvdnav/msvc/include/os_types.h b/lib/libdvd/libdvdnav/msvc/include/os_types.h
index 69f05a8d93..294847ea3f 100755
--- a/lib/libdvd/libdvdnav/msvc/include/os_types.h
+++ b/lib/libdvd/libdvdnav/msvc/include/os_types.h
@@ -1,9 +1,6 @@
 #ifndef __OS_TYPES_H__
 #define __OS_TYPES_H__
 /*
- * $Id: os_types.h 1135 2008-09-06 21:55:51Z rathann $
- * $Name$
- *
  * win32 types
  * 04 Sept 2001 - Chris Wolf create.
  */
diff --git a/lib/libdvd/libdvdnav/msvc/include/pthreads/pthread.h b/lib/libdvd/libdvdnav/msvc/include/pthreads/pthread.h
index 7b89ca8401..9f6fae54fa 100755
--- a/lib/libdvd/libdvdnav/msvc/include/pthreads/pthread.h
+++ b/lib/libdvd/libdvdnav/msvc/include/pthreads/pthread.h
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
  */
 
 #if !defined( PTHREAD_H )
diff --git a/lib/libdvd/libdvdnav/msvc/include/pthreads/sched.h b/lib/libdvd/libdvdnav/msvc/include/pthreads/sched.h
index ab277920e0..d7596b292d 100755
--- a/lib/libdvd/libdvdnav/msvc/include/pthreads/sched.h
+++ b/lib/libdvd/libdvdnav/msvc/include/pthreads/sched.h
@@ -22,8 +22,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
  */
 #ifndef _SCHED_H
 #define _SCHED_H
diff --git a/lib/libdvd/libdvdnav/msvc/include/sys/time.h b/lib/libdvd/libdvdnav/msvc/include/sys/time.h
index f874fa655f..843e252c66 100755
--- a/lib/libdvd/libdvdnav/msvc/include/sys/time.h
+++ b/lib/libdvd/libdvdnav/msvc/include/sys/time.h
@@ -14,8 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * WIN32 PORT,
  * by Matthew Grooms <elon@altavista.com>
diff --git a/lib/libdvd/libdvdnav/msvc/include/unistd.h b/lib/libdvd/libdvdnav/msvc/include/unistd.h
index 7e4c63f3a5..2f3c4587ed 100755
--- a/lib/libdvd/libdvdnav/msvc/include/unistd.h
+++ b/lib/libdvd/libdvdnav/msvc/include/unistd.h
@@ -14,8 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * WIN32 PORT,
  * by Matthew Grooms <elon@altavista.com>