Index: files/patch-include-vlc_common.h
===================================================================
--- files/patch-include-vlc_common.h.orig
+++ files/patch-include-vlc_common.h
@@ -0,0 +1,11 @@
+--- include/vlc_common.h.orig
++++ include/vlc_common.h
+@@ -642,7 +642,7 @@ static inline unsigned popcount (unsigne
+ #endif
+ }
+ 
+-#ifdef __OS2__
++#if defined(__OS2__) || defined(__FreeBSD__)
+ #   undef bswap16
+ #   undef bswap32
+ #   undef bswap64
Index: files/patch-modules-gui-qt4-dialogs-help.cpp
===================================================================
--- files/patch-modules-gui-qt4-dialogs-help.cpp.orig
+++ files/patch-modules-gui-qt4-dialogs-help.cpp
@@ -0,0 +1,11 @@
+--- modules/gui/qt4/dialogs/help.cpp.orig
++++ modules/gui/qt4/dialogs/help.cpp
+@@ -112,7 +112,7 @@ AboutDialog::AboutDialog( intf_thread_t 
+                 "popular platform.\n\n" )
+             + qtr( "This version of VLC was compiled by:\n " )
+             + qfu( VLC_CompileBy() )+ " on " + qfu( VLC_CompileHost() ) +
+-            + " ("__DATE__" "__TIME__").\n"
++            + " (" + __DATE__ + " " + __TIME__ + ").\n"
+             + qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n"
+             + qtr( "You are using the Qt4 Interface.\n\n" )
+             + qtr( "Copyright (C) " ) + COPYRIGHT_YEARS