diff --git a/libmpdvdkit2/common.h b/libmpdvdkit2/common.h
index dd6a5dbc97..d1a1fc38e9 100644
--- a/libmpdvdkit2/common.h
+++ b/libmpdvdkit2/common.h
@@ -49,13 +49,13 @@
 
 #if defined( WIN32 )
 
-#ifndef PATH_MAX
-#   define PATH_MAX MAX_PATH
-#endif
+#   ifndef PATH_MAX
+#      define PATH_MAX MAX_PATH
+#   endif
 
 /* several type definitions */
 #   if defined( __MINGW32__ )
-#define lseek _lseeki64
+#       define lseek _lseeki64
 #       if !defined( _OFF_T_ )
 typedef long long _off_t;
 typedef _off_t off_t;
diff --git a/libmpdvdkit2/device.h b/libmpdvdkit2/device.h
index 21da4ffba0..75a2967902 100644
--- a/libmpdvdkit2/device.h
+++ b/libmpdvdkit2/device.h
@@ -44,9 +44,9 @@ struct iovec
 /*****************************************************************************
  * Device reading prototypes
  *****************************************************************************/
-int _dvdcss_use_ioctls ( dvdcss_t );
-int _dvdcss_open       ( dvdcss_t );
-int _dvdcss_close      ( dvdcss_t );
+int  _dvdcss_use_ioctls ( dvdcss_t );
+int  _dvdcss_open       ( dvdcss_t );
+int  _dvdcss_close      ( dvdcss_t );
 
 /*****************************************************************************
  * Device reading prototypes, raw-device specific
diff --git a/libmpdvdkit2/libdvdcss.c b/libmpdvdkit2/libdvdcss.c
index b1aba02a96..c272f28e3a 100644
--- a/libmpdvdkit2/libdvdcss.c
+++ b/libmpdvdkit2/libdvdcss.c
@@ -159,7 +159,7 @@ char * dvdcss_interface_2 = VERSION;
  * and when possible, the disc key is retrieved.
  *
  * dvdcss_open() returns a handle to be used for all subsequent \e libdvdcss
- * calls. If an error occured, NULL is returned.
+ * calls. If an error occurred, NULL is returned.
  */
 extern dvdcss_t dvdcss_open ( char *psz_target )
 {
@@ -550,14 +550,14 @@ extern dvdcss_t dvdcss_open ( char *psz_target )
 }
 
 /**
- * \brief Return a string containing the latest error that occured in the
+ * \brief Return a string containing the latest error that occurred in the
  *        given \e libdvdcss instance.
  *
  * \param dvdcss a \e libdvdcss instance.
  * \return a null-terminated string containing the latest error message.
  *
  * This function returns a constant string containing the latest error that
- * occured in \e libdvdcss. It can be used to format error messages at your
+ * occurred in \e libdvdcss. It can be used to format error messages at your
  * convenience in your application.
  */
 extern char * dvdcss_error ( dvdcss_t dvdcss )