Plugins: include vlc_common.h directly instead of vlc/vlc.h

diff --git a/modules/access/bda/bda.h b/modules/access/bda/bda.h
index 6252809c3240cb49a6db675cb28d08454ddc406c..8f4d37ba0aabd9ede00d2985d31e427386fa67a4 100644 (file)
--- a/modules/access/bda/bda.h
+++ b/modules/access/bda/bda.h
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index b8d53fa2d85d9684b0aea79b5ef09680354bbf93..cd81e9efd03b8eeec308ce2655a6e26fd3ca75e0 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -36,7 +36,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_access.h>

diff --git a/modules/access/cdda/callback.h b/modules/access/cdda/callback.h
index a8528d4d5fa905f3c321b671da5ddee9b9a97a0c..dc290141e21cd054ae5c1cce7f6a03525620cbab 100644 (file)
--- a/modules/access/cdda/callback.h
+++ b/modules/access/cdda/callback.h
@@ -25,7 +25,7 @@
 #   include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 /*
    Minimum, maximum and default number of blocks we allow on read.

diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index 44e841df635842f75130e53ec2fdd993ba0606ee..34cd3aa42ab4dcc7135cf4dcdb9a763e9cead2bf 100644 (file)
--- a/modules/access/dc1394.c
+++ b/modules/access/dc1394.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_vout.h>

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 1e41dec79c80391af445cbc11b8a7eb3752a7b91..3acb6a57664bad3311dbf06e38f7125f51d6d682 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_input.h>

diff --git a/modules/access/dshow/crossbar.cpp b/modules/access/dshow/crossbar.cpp
index 36c50d48db8e95f1d87f6df0cea60bdbcb5f8271..41898bcde7b048261b5d0dc93a04fc542269ba8a 100644 (file)
--- a/modules/access/dshow/crossbar.cpp
+++ b/modules/access/dshow/crossbar.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 
 #ifndef _MSC_VER

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index a52b56b764a0a3150b10a230b4fdc7531221b51f..cfaacc1ad5bcbec63f57f28422d4d57bc701b809 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -33,7 +33,7 @@
 #define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_access.h>

diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp
index 21496311d6bb476e044a0eed2df9c028064cbd4b..37c34c7721de76ac899a52d9145033fd5289108e 100644 (file)
--- a/modules/access/dshow/filter.cpp
+++ b/modules/access/dshow/filter.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 
 #ifndef _MSC_VER

diff --git a/modules/access/dv.c b/modules/access/dv.c
index ee5104c91286ec24e189fb40f9faeecdec0da705..8962de4217f1d7f7735ad00691fc919b0f23e7af 100644 (file)
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 5057f12a1092dcd94045a78969a962534d906adb..690072c5c1a774d2ab27559b665d7f82dafbeccb 100644 (file)
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_interface.h>

diff --git a/modules/access/dvb/en50221.c b/modules/access/dvb/en50221.c
index 3b18c8581f0565b171b312daa56478cb7629aa98..a6a593c066690c389d958bb59d245a8f03cbbe7e 100644 (file)
--- a/modules/access/dvb/en50221.c
+++ b/modules/access/dvb/en50221.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_access.h>
 
 #include <sys/ioctl.h>

diff --git a/modules/access/dvb/http.c b/modules/access/dvb/http.c
index 91c98f956fa24509df79d6aa744169cb1c63cc25..8074273465e20fc79eda1f2b6e5c220a1d8390da 100644 (file)
--- a/modules/access/dvb/http.c
+++ b/modules/access/dvb/http.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_access.h>
 
 #ifdef HAVE_UNISTD_H

diff --git a/modules/access/dvb/linux_dvb.c b/modules/access/dvb/linux_dvb.c
index f342777f004e37aab46412625b47ef2850072efb..f72eeace0b83ee59391efa18b30e8c7f86a58b1b 100644 (file)
--- a/modules/access/dvb/linux_dvb.c
+++ b/modules/access/dvb/linux_dvb.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_access.h>
 #include <sys/ioctl.h>
 #include <errno.h>

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 48ea51300623ba6bfd6dce9222494712446602f4..58de10d592d04f3d810a8637c5f7ac31c2c331f2 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_access.h>

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 12f7530d2a8052c29f532e0cfd67b97ed9711e02..ee140f067e9c320c9adc26ddf9befea25481226c 100644 (file)
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_access.h>

diff --git a/modules/access/eyetv.m b/modules/access/eyetv.m
index dc204e3f8bafb07ae8a3c0dbbb198133f5e34955..9d57c9ffc986e64c47eeafdf1b293cab5f656e0b 100644 (file)
--- a/modules/access/eyetv.m
+++ b/modules/access/eyetv.m
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/fake.c b/modules/access/fake.c
index c76c95ba35d999f7e3fd0d7dc45eca3a033211a5..b97c208a60ec93112f0171fcb2cf5d821b719b2d 100644 (file)
--- a/modules/access/fake.c
+++ b/modules/access/fake.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_demux.h>

diff --git a/modules/access/file.c b/modules/access/file.c
index a5fb40661eb91e9f3b3625aff9a1296066a477e6..29228dc45bca58c3afe4befe9a847e2b08355b97 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_access.h>

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index d1512d9853eece8e734d25886e0b1b51660621a7..327f77532b5e92c9ac48f993d256fcb23b0840c3 100644 (file)
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <assert.h>

diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c
index 8dcf9d0c7938e3ad586599fdfb0ca1cfdfa6a847..fb8f56bed8e3e000edd9113cc5e2b07eec55e472 100644 (file)
--- a/modules/access/gnomevfs.c
+++ b/modules/access/gnomevfs.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/http.c b/modules/access/http.c
index 9b28a2360fc921231bb2b060f0753f722f0e57e2..8a04e145cab9f14b13eaefda4f753bcd993b61c7 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 

diff --git a/modules/access/jack.c b/modules/access/jack.c
index d1b95dff709b08fd14e76e3c2c2d75fc1b7711b1..b71745b20b58ca7aa8b434e431fc94eb80a9f02a 100644 (file)
--- a/modules/access/jack.c
+++ b/modules/access/jack.c
@@ -37,7 +37,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_demux.h>

diff --git a/modules/access/mmap.c b/modules/access/mmap.c
index 774021ba10c7e7fc6ef1abdec8c75e783dd79226..9f358546f541299b319d806a255db47b14eefb75 100644 (file)
--- a/modules/access/mmap.c
+++ b/modules/access/mmap.c
@@ -23,7 +23,7 @@
 # include <config.h>
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_input.h>

diff --git a/modules/access/mms/asf.c b/modules/access/mms/asf.c
index 23998c6f2ae19f25d8fc14e7eb07842161c75c7c..0ef7c2477204b55a4b8b63ca07a362236996ea49 100644 (file)
--- a/modules/access/mms/asf.c
+++ b/modules/access/mms/asf.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "asf.h"
 #include "buffer.h"

diff --git a/modules/access/mms/buffer.c b/modules/access/mms/buffer.c
index 5cc2c503faababe78b92d26b16e87462dc2e832f..06115d35f1e1e259593fecc6ab1332ffc4b7dfac 100644 (file)
--- a/modules/access/mms/buffer.c
+++ b/modules/access/mms/buffer.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "asf.h"
 #include "buffer.h"

diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c
index 091bfeb63e34211fbbd6c4ee0f3d39787054481e..fca871e372845940b093867f9737cb7b6479e805 100644 (file)
--- a/modules/access/mms/mms.c
+++ b/modules/access/mms/mms.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index c188f93f47562a86937a2e82ac9d28b8f305b9ba..b67e7cf665e45c07900e07e8e689f930ac93fed0 100644 (file)
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_access.h>
 #include "vlc_playlist.h"
 #include "vlc_strings.h"

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 776f0c273d5fc78ac9c2ce3ab0386e40b77acc12..a3867bf64d3db89929d3e4a74e0c8652126823d9 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_access.h>
 
 #include <errno.h>

diff --git a/modules/access/pvr.c b/modules/access/pvr.c
index 4bb300e2c3aebf5151cd6bb46f2ae66fdf02e9aa..c7e3b6edd096a1704f9936ebf53db37df7f44de3 100644 (file)
--- a/modules/access/pvr.c
+++ b/modules/access/pvr.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m
index 47e2725ae2cae4ba530cf298b5c35fc526dbe69c..48b8ac718dff388e02e169e99c225e50c9ccb1c8 100644 (file)
--- a/modules/access/qtcapture.m
+++ b/modules/access/qtcapture.m
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_vout.h>

diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c
index 1df9f62b531436349e1f27dedc201e055c3912a1..41f77768768e077ff8d476d412987bd9581eae55 100644 (file)
--- a/modules/access/rtmp/access.c
+++ b/modules/access/rtmp/access.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/rtmp/rtmp_amf_flv.c b/modules/access/rtmp/rtmp_amf_flv.c
index 859bc128bc5d54b31df7da729fcf54706e9a0300..2299db113aa034dcec56879271cce05deaa63aa3 100644 (file)
--- a/modules/access/rtmp/rtmp_amf_flv.c
+++ b/modules/access/rtmp/rtmp_amf_flv.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_access.h>
 
 #include <vlc_network.h> /* DOWN: #include <network.h> */

diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c
index b8b42b12a23747831624333bf64c974d57680bc1..a1492a69af0be2192e3a7464062b6bdb73c663bc 100644 (file)
--- a/modules/access/rtsp/access.c
+++ b/modules/access/rtsp/access.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_interface.h>

diff --git a/modules/access/rtsp/real.c b/modules/access/rtsp/real.c
index da499ec2d35320b8c0155e09abc1ec50e07c6cb7..94534c907ef19099f924b37f036950beb37af53c 100644 (file)
--- a/modules/access/rtsp/real.c
+++ b/modules/access/rtsp/real.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "rtsp.h"
 #include "real.h"

diff --git a/modules/access/rtsp/real.h b/modules/access/rtsp/real.h
index 71558f4d974613b8169a7f896d4caf1a36642310..bb2479c5936309d14c53f447fe725e4d3fc96dd2 100644 (file)
--- a/modules/access/rtsp/real.h
+++ b/modules/access/rtsp/real.h
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "rtsp.h"
 #include "real_rmff.h"
 #include "real_sdpplin.h"

diff --git a/modules/access/rtsp/rtsp.c b/modules/access/rtsp/rtsp.c
index 6730a931168951880e6452bbe4064aed7c7eef94..9587cea4c5e035e363fdf858f6a191c109105076 100644 (file)
--- a/modules/access/rtsp/rtsp.c
+++ b/modules/access/rtsp/rtsp.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "rtsp.h"
 

diff --git a/modules/access/screen/beos.cpp b/modules/access/screen/beos.cpp
index cd75919e52c165d5c77ca976f18a726b34d81887..165250c9c301dc59741e1456decda7db7c354281 100644 (file)
--- a/modules/access/screen/beos.cpp
+++ b/modules/access/screen/beos.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <Screen.h>
 #include <Bitmap.h>

diff --git a/modules/access/screen/mac.c b/modules/access/screen/mac.c
index d45b828343fed60f85c913bea63e8184f2a59e8a..13afb1216ab4cc05b9183f01c406cb5bf7203d61 100644 (file)
--- a/modules/access/screen/mac.c
+++ b/modules/access/screen/mac.c
@@ -31,7 +31,7 @@
 # import "config.h"
 #endif
 
-#import <vlc/vlc.h>
+#import <vlc_common.h>
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <OpenGL/OpenGL.h>

diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c
index 2b1a19f676dbda8abcede7944bb22907f648d59d..c4f7422ab85f24fab6c1df32b4fd918bfd446cbd 100644 (file)
--- a/modules/access/screen/screen.c
+++ b/modules/access/screen/screen.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include "screen.h"
 

diff --git a/modules/access/screen/win32.c b/modules/access/screen/win32.c
index 0815f90e74254456db4df6b471958b1917fc5f57..4255bdf3af85a6bcd6e3ec39c43f9714397130e1 100644 (file)
--- a/modules/access/screen/win32.c
+++ b/modules/access/screen/win32.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "screen.h"
 

diff --git a/modules/access/screen/x11.c b/modules/access/screen/x11.c
index 60202857fa5a4575b68e2ba03342d0ecf90f2d53..f576096785f298fc9ddbfb3003da9e6b25507401 100644 (file)
--- a/modules/access/screen/x11.c
+++ b/modules/access/screen/x11.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

diff --git a/modules/access/smb.c b/modules/access/smb.c
index 4072071684bb5a182814701625dcab3c23f8fe55..ba9b8aa6ad664f5b08db22cd0b08406672c04cae 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index ecfe4a1b8964857ce3aaa7c7fc2096b6ba23a2d1..7784b6fe1ff10340cc55afaac772115985a45347 100644 (file)
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/udp.c b/modules/access/udp.c
index 5b62a38051ffc100e0c6dc217f856b564fb80a6f..394fa948926c2e2e3642c8c2e422a7ae2c71b591 100644 (file)
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -36,7 +36,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_network.h>

diff --git a/modules/access/v4l.c b/modules/access/v4l.c
index a1ffaf1aa35d70251579dea0f377c468c861a015..9709f0070a750903ebe7182c67e804908dfeaa13 100644 (file)
--- a/modules/access/v4l.c
+++ b/modules/access/v4l.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_demux.h>

diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c
index df497733bb7322a7dba68476be40faec76d6daaf..571d2a4b4ce2d855e8bd9042464300b975487cc8 100644 (file)
--- a/modules/access/v4l2/v4l2.c
+++ b/modules/access/v4l2/v4l2.c
@@ -42,7 +42,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_demux.h>

diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index c38b126230459af7f149e5d904fd9bca1e4d8649..8c03ccb6403d946d2c034b5d949f5b72535e599e 100644 (file)
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_access.h>
 
 #ifdef HAVE_UNISTD_H

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index a74adedd36c632edefd4715e0dabe442dd27473b..575ff326686a9b0343a577442561414b1196f725 100644 (file)
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_access.h>

diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index 0509cd763fcb0154ba2f2177039722a08bbe696d..a4fc5bb4d506ffc8e82da0eef8f0108727f25fa0 100644 (file)
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>
 #include <vlc_access.h>

diff --git a/modules/access/vcdx/demux.c b/modules/access/vcdx/demux.c
index 8d1b674f858b6ec99f8763d46d3e0ec2575bef5a..5f534c191ca4724a0ad98f0190ecbe295569eb19 100644 (file)
--- a/modules/access/vcdx/demux.c
+++ b/modules/access/vcdx/demux.c
@@ -30,7 +30,7 @@
 #endif
 
 #include <stddef.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
 #include <vlc_interface.h>

diff --git a/modules/access/vcdx/info.c b/modules/access/vcdx/info.c
index ca4a9ef89155f1793c958eac64a3f1cd509a7fcb..aea29ea14d2c6a6c0534be3d2dc203e19e9676f8 100644 (file)
--- a/modules/access/vcdx/info.c
+++ b/modules/access/vcdx/info.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
 #include "vcd.h"

diff --git a/modules/access/vcdx/intf.c b/modules/access/vcdx/intf.c
index 71ac648a5755c2bbf1d90285fbdc57aa9763e730..34d382b1c77224248ca12aa597b7ad551ff6c019 100644 (file)
--- a/modules/access/vcdx/intf.c
+++ b/modules/access/vcdx/intf.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/vcdx/intf.h b/modules/access/vcdx/intf.h
index 3a1cf9a0c39704829e7b2d5b6ba24ecc26ea0960..5a2f9499717e816ce01f4413e6dbba94a67a4994 100644 (file)
--- a/modules/access/vcdx/intf.h
+++ b/modules/access/vcdx/intf.h
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include "vcdplayer.h"
 

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index 5e9cd5b4401e5419bedbd1a43bf9818bcf303d66..e4d525f8bd31dd68b5d8bada2dd933b60f68af14 100644 (file)
--- a/modules/access/vcdx/vcd.c
+++ b/modules/access/vcdx/vcd.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_charset.h>
 

diff --git a/modules/access/vcdx/vcdplayer.c b/modules/access/vcdx/vcdplayer.c
index 36d3d50ac6a35d83334103db12ad9a26390e3fa1..02358d25b1c6af53d784c8f9ba96f1d04337fa7b 100644 (file)
--- a/modules/access/vcdx/vcdplayer.c
+++ b/modules/access/vcdx/vcdplayer.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>
 

diff --git a/modules/access_filter/bandwidth.c b/modules/access_filter/bandwidth.c
index 1d7b25122aff25b37220cc9a8575d573e4d48758..ff00f9c709ee3b068bd66009e34cd61e4351c7e3 100644 (file)
--- a/modules/access_filter/bandwidth.c
+++ b/modules/access_filter/bandwidth.c
@@ -23,7 +23,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <assert.h>

diff --git a/modules/access_filter/dump.c b/modules/access_filter/dump.c
index 8760ca91ef82794b37e2ead5d0e1c922cbe2837c..f6e28f696cbf589d348fd1e8412ccfad83ee17a1 100644 (file)
--- a/modules/access_filter/dump.c
+++ b/modules/access_filter/dump.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <assert.h>

diff --git a/modules/access_filter/record.c b/modules/access_filter/record.c
index dd424a4fc6247f74bf62c4935518034067a17a71..2b6bd78076d18176c21b506374efcbb74ed875bf 100644 (file)
--- a/modules/access_filter/record.c
+++ b/modules/access_filter/record.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <vlc_input.h>

diff --git a/modules/access_filter/timeshift.c b/modules/access_filter/timeshift.c
index da4284e4d9e528108a8f22cae90963e841d383e4..54c79c88f37a539e0591c4e4cff60ee5cb052c4a 100644 (file)
--- a/modules/access_filter/timeshift.c
+++ b/modules/access_filter/timeshift.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <errno.h>

diff --git a/modules/access_output/bonjour.c b/modules/access_output/bonjour.c
index d7f640e32231e3b4a980a08d32da0321aaca0cb0..d02240b3e3497af3b4a4eae14ce95b3827ec06ba 100644 (file)
--- a/modules/access_output/bonjour.c
+++ b/modules/access_output/bonjour.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "bonjour.h"
 
 #ifdef HAVE_AVAHI_CLIENT

diff --git a/modules/access_output/dummy.c b/modules/access_output/dummy.c
index 300a19c5c936c18841a308049111d5243cbc0b06..23893c384c2ac05fe4b81f353aaaa95d8f8e06b2 100644 (file)
--- a/modules/access_output/dummy.c
+++ b/modules/access_output/dummy.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index d5ad889a747939ce9ba1540be874bae63f83c4df..9cf4d98c99f6059f970529b214814b38b0e07528 100644 (file)
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -35,7 +35,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 7f2de0d1a7d5dc530710018ea6723e066da62836..8b9c16bcb4101c949921b2d81f9308a7caa5d214 100644 (file)
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/access_output/rtmp.c b/modules/access_output/rtmp.c
index fd826dcb31c8abae6ebc79ab3a07116b1649776c..670aec700780be22399cebeca0b2b0bea36a58cb 100644 (file)
--- a/modules/access_output/rtmp.c
+++ b/modules/access_output/rtmp.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 

diff --git a/modules/access_output/shout.c b/modules/access_output/shout.c
index 169aeaeb5096438f246879015775525a3c879d26..e6374aa71a37abbad7843e81fbf277ca26baff54 100644 (file)
--- a/modules/access_output/shout.c
+++ b/modules/access_output/shout.c
@@ -45,7 +45,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index d9348ed07f98a3ba5be20db844ee133b6f504095..20520fcd4dbdb06bf72e0c5e230424dff675bd08 100644 (file)
--- a/modules/access_output/udp.c
+++ b/modules/access_output/udp.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <sys/types.h>

diff --git a/modules/audio_filter/channel_mixer/dolby.c b/modules/audio_filter/channel_mixer/dolby.c
index 2da045cbb3890024c3ea8be9cb57e5f8c7f79d38..032da2aa8d850353a949b4321be45d499d55d7f6 100644 (file)
--- a/modules/audio_filter/channel_mixer/dolby.c
+++ b/modules/audio_filter/channel_mixer/dolby.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index df40cfee07c2cbf2f300f138555ee71263fbbcf7..668cd8cd01850d015e34c96a3a8392d5ba13185b 100644 (file)
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_filter.h>

diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index eff910ca799a12e8688cea5ec3522b576fcd0faf..5c1a293512fd9eed91cd9f03dc6ff79ad7d09eb8 100644 (file)
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -40,7 +40,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_es.h>
 #include <vlc_block.h>

diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index e95d0dd93fcac9a232960b2144baf423283fbfc7..36da5ab689917362ec9a08cde0d6951750342e64 100644 (file)
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_filter.h>

diff --git a/modules/audio_filter/channel_mixer/trivial.c b/modules/audio_filter/channel_mixer/trivial.c
index 92064ae43d694453135ca2b99070e2de42934735..0f8cd21adb267dc9810649927ac771e5433c9727 100644 (file)
--- a/modules/audio_filter/channel_mixer/trivial.c
+++ b/modules/audio_filter/channel_mixer/trivial.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index b1389b2fbf12b802de92863626ea3743852c3235..e07e4353e9d5d5cefa084aaa2cdf272c3d1bbcf4 100644 (file)
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ b/modules/audio_filter/converter/a52tofloat32.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #ifdef HAVE_STDINT_H

diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c
index 1c5ee7b08f84ac14e78eb9247b0e595c9f799f08..3f08c85a34b26d4204031ce7b4d162506ae7ab10 100644 (file)
--- a/modules/audio_filter/converter/a52tospdif.c
+++ b/modules/audio_filter/converter/a52tospdif.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #ifdef HAVE_UNISTD_H

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index 4dd710a2e1397aff927bc4141b078f6ed715a3a1..26d46eb809553655551556ed0c78e337e1a87bb0 100644 (file)
--- a/modules/audio_filter/converter/dtstofloat32.c
+++ b/modules/audio_filter/converter/dtstofloat32.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 

diff --git a/modules/audio_filter/converter/dtstospdif.c b/modules/audio_filter/converter/dtstospdif.c
index 7c1777e9235731924c4d8e4c6fb43428f1bbd377..ea0cba3c7000ea94fe69d4590dfadb6cb256c2f3 100644 (file)
--- a/modules/audio_filter/converter/dtstospdif.c
+++ b/modules/audio_filter/converter/dtstospdif.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 

diff --git a/modules/audio_filter/converter/fixed.c b/modules/audio_filter/converter/fixed.c
index 02f9c470a7776c44712de43140e5d845a595161e..ec592d56327b58ea95debbd04a85ff1be026af12 100644 (file)
--- a/modules/audio_filter/converter/fixed.c
+++ b/modules/audio_filter/converter/fixed.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_filter/converter/float.c b/modules/audio_filter/converter/float.c
index 7e3050517d40607b02c0c1bef4def7d7588835ab..302a3f2cc6e165d9d78ec0e418e1f1d94c5a5d5f 100644 (file)
--- a/modules/audio_filter/converter/float.c
+++ b/modules/audio_filter/converter/float.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #ifdef HAVE_UNISTD_H

diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index 9cf40a57c888d2a6aae85751076a339336f86c0e..1d1bf79d1ea599ae857922057a4c1f31efd49050 100644 (file)
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_block.h>

diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c
index 32ba5fd565d234b1bf4cbd18313895185432bc47..9c9b08d5defb91b5f1ce1bcd6794bd1120d69b77 100644 (file)
--- a/modules/audio_filter/equalizer.c
+++ b/modules/audio_filter/equalizer.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include "vlc_aout.h"

diff --git a/modules/audio_filter/format.c b/modules/audio_filter/format.c
index 55b5fd0f5bd7996b35410482c4c8ca70901ed9a8..5aa45170970d30a60fdb45079e37469d24df855a 100644 (file)
--- a/modules/audio_filter/format.c
+++ b/modules/audio_filter/format.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_block.h>

diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c
index 47bd3a86ae0d128e6d7e1aa56b312ff0d0fa7767..97ed3c78ac6fc9d16ebfee1297f284a4e233d8e0 100644 (file)
--- a/modules/audio_filter/normvol.c
+++ b/modules/audio_filter/normvol.c
@@ -43,7 +43,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <vlc_aout.h>

diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c
index 1d4a56d9203d0fec1ec9d23776effe63e0df86a5..acd04de903a85e81d28e3444cd0e7f8d46138810 100644 (file)
--- a/modules/audio_filter/param_eq.c
+++ b/modules/audio_filter/param_eq.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index 58dad6ca4d313ea2468c669795f103951e258f07..f30748693d7702ea88369f4d227eb0cb2f7b3b3b 100644 (file)
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -37,7 +37,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c
index 2a0bde35ed5191f0168b8ed6ec975b84eead767c..2a51cd2e5833ad1d1fccf2c585b8c95fda6db4d3 100644 (file)
--- a/modules/audio_filter/resampler/linear.c
+++ b/modules/audio_filter/resampler/linear.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_filter.h>

diff --git a/modules/audio_filter/resampler/trivial.c b/modules/audio_filter/resampler/trivial.c
index a9a3b2d4383ac2d8aa9a0cd732ae3c155684e632..859ec5c6ee16d43d154297e4203748f3cb56ead1 100644 (file)
--- a/modules/audio_filter/resampler/trivial.c
+++ b/modules/audio_filter/resampler/trivial.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c
index 6fe27fed617ce563c861a3793181e3b5b13f1dbe..7d9053b044cce2daccd28b6f30a4bf4b113275a5 100644 (file)
--- a/modules/audio_filter/resampler/ugly.c
+++ b/modules/audio_filter/resampler/ugly.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_filter/spatializer/spatializer.cpp b/modules/audio_filter/spatializer/spatializer.cpp
index 50642cd4a0cf4da98a18f25b53aa34aa800b72d3..1fc4c97d70c37838bcb50320c753d64ac88f144a 100644 (file)
--- a/modules/audio_filter/spatializer/spatializer.cpp
+++ b/modules/audio_filter/spatializer/spatializer.cpp
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include "vlc_aout.h"
 #include "revmodel.hpp"

diff --git a/modules/audio_mixer/float32.c b/modules/audio_mixer/float32.c
index be93a5e6d66c33b78b2d4515ee4395bc5e736d55..943bc5dcfb6c8433f9a95e1bae54075364051ab4 100644 (file)
--- a/modules/audio_mixer/float32.c
+++ b/modules/audio_mixer/float32.c
@@ -30,7 +30,7 @@
 #endif
 
 #include <stddef.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_mixer/spdif.c b/modules/audio_mixer/spdif.c
index 46c6989e9c60b794f758fe3e149e6d42ed50a246..aa65ff021c7077e571cca0bc259991a550b435bb 100644 (file)
--- a/modules/audio_mixer/spdif.c
+++ b/modules/audio_mixer/spdif.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c
index 3072125248ed04af454c868cb30bbe071e6c8790..5a7c260a7638cbfeedbde625b48db92054146c53 100644 (file)
--- a/modules/audio_mixer/trivial.c
+++ b/modules/audio_mixer/trivial.c
@@ -30,7 +30,7 @@
 #endif
 
 #include <stddef.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 1dbc2c6fd340f0d53aae3ec14066ab5844d78737..c6d7a58d99e09ddb1a6ca91850816236c6ec0c89 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <errno.h>                                                 /* ENOMEM */

diff --git a/modules/audio_output/arts.c b/modules/audio_output/arts.c
index ee5d6f838386ff80488e0ef3458a03fed0915b60..ef4b2617bdcf42db2342ec4a227ed1ccb03f7411 100644 (file)
--- a/modules/audio_output/arts.c
+++ b/modules/audio_output/arts.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 5631db65df0d7d6b6b86b516abe28863dd128397..7ef69e220aa9c613360609ac0dd3fd654493547e 100644 (file)
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -30,7 +30,7 @@
 
 #include <unistd.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_aout.h>

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 9641c9591bba09cce9a2763272dbfc970fcda40e..9df65151db1c696696cb6083ab8891146f9fbe44 100644 (file)
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c
index 4d57ef0f94d457807457a75612a32563d69fbc45..e844d14a6af55cb26ef10a0527ab5c84364dce7b 100644 (file)
--- a/modules/audio_output/esd.c
+++ b/modules/audio_output/esd.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 0c877eb439ac5b417b306a9c92417dbc998af444..e2251c4b1aad48b7f3dc884228160183cb0588ea 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codecs.h> /* WAVEHEADER */

diff --git a/modules/audio_output/hd1000a.cpp b/modules/audio_output/hd1000a.cpp
index f41b0198685178b5d7e0a1af23bcddeb23ef3c00..5e81ae742647d365cacc65f891306f60320cbd4a 100644 (file)
--- a/modules/audio_output/hd1000a.cpp
+++ b/modules/audio_output/hd1000a.cpp
@@ -32,7 +32,7 @@ extern "C"
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c
index 41e79dd42d5c26e43b9933946de9e2921ff0021f..7fb409bb2410adce6ab4348ee60f4d2d2e40609f 100644 (file)
--- a/modules/audio_output/jack.c
+++ b/modules/audio_output/jack.c
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 755359b49df196a4b3e58574d4d2f20ad27e7b02..2ea467b3b626d98d06ce1cb4bd5630776d191b55 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -35,7 +35,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #ifdef HAVE_ALLOCA_H

diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c
index 6345a86abf3f87f6d49f612bcff7d0b1c9f5e61e..7c1d256baa858aaf8f940b261d5cf230e706aa5e 100644 (file)
--- a/modules/audio_output/portaudio.c
+++ b/modules/audio_output/portaudio.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 8dc7a20be2ffdee87346e6bfc92c22fb938a3861..5d0c39daeb3766af1b944f6b1c911cd2c51c2773 100644 (file)
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <vlc_aout.h>

diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c
index ca62dfbc978f5145f586b86c2c0b8e598f04efcb..7dc215f1e4d4cb23a159d5fde676d6d7fd2335b6 100644 (file)
--- a/modules/audio_output/sdl.c
+++ b/modules/audio_output/sdl.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 93be9c2acfe92f71ce2506d363dee6b069602c00..2a57e01a558644006fc10abc30c6ca5517bfecbc 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_charset.h>

diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index 9aa0b0bfb67de6e61484001b76cb6d704b118acd..fec3f80ae1d0c838fa3b3cbefd8d0b4adc6d5ab7 100644 (file)
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_aout.h>

diff --git a/modules/codec/adpcm.c b/modules/codec/adpcm.c
index 7b0eb7350f42da55646fd91819985e77d61e65ad..9c280165ad7908467f17f2c211b4541431688d80 100644 (file)
--- a/modules/codec/adpcm.c
+++ b/modules/codec/adpcm.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/araw.c b/modules/codec/araw.c
index b36c6cc1405fb102c6530b27d27333c82e450448..43de4ddff5afdee54728b0ba8d8c4811f49b5e6e 100644 (file)
--- a/modules/codec/araw.c
+++ b/modules/codec/araw.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index 337ccad7e31e03037170f9be3975d5465d93c247..5b09488a5aec16a8a211f42e67ac38868b371709 100644 (file)
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -37,7 +37,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/cdg.c b/modules/codec/cdg.c
index 5214a59f93192c8c5fe1eab2da5631b9e173b56b..af912284ef4be3e4db7d6a55ba35137fb467eec1 100644 (file)
--- a/modules/codec/cdg.c
+++ b/modules/codec/cdg.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>

diff --git a/modules/codec/cinepak.c b/modules/codec/cinepak.c
index 2092d04a271bad4c3c509ab5a538b40e708bf813..fadcc2a7dfb176380ecfb8118e5346f785af9795 100644 (file)
--- a/modules/codec/cinepak.c
+++ b/modules/codec/cinepak.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/cmml/cmml.c b/modules/codec/cmml/cmml.c
index 0f6ae97a2863473f030580842adb4022a1dd29e8..a2bd47a1a61e43ce9fbd7c5347bc5d5f1cb0b175 100644 (file)
--- a/modules/codec/cmml/cmml.c
+++ b/modules/codec/cmml/cmml.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/cmml/history.c b/modules/codec/cmml/history.c
index c6c19563d513c611ea46bc224049078e0e088512..ff29847bd2a4607116f094bbfc4a741c58893621 100644 (file)
--- a/modules/codec/cmml/history.c
+++ b/modules/codec/cmml/history.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 
 #include "history.h"

diff --git a/modules/codec/cmml/intf.c b/modules/codec/cmml/intf.c
index 4a13d427c53a5c33c4b514bc9b0e6442022a7712..1ecfbf0a409b32be67b2db3bc6131e86ab007cb6 100644 (file)
--- a/modules/codec/cmml/intf.c
+++ b/modules/codec/cmml/intf.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 

diff --git a/modules/codec/cmml/xurl.h b/modules/codec/cmml/xurl.h
index ccc67ac11003ebf186ebeee3f25f683272b6d9a8..9a57b00bc4f250a3f0a00be114452bdf9f24598f 100644 (file)
--- a/modules/codec/cmml/xurl.h
+++ b/modules/codec/cmml/xurl.h
@@ -27,7 +27,7 @@
 #ifndef __XURL_H__
 #define __XURL_H__
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 /* Specialise boolean definitions to VLC's boolean types */
 typedef bool XURL_Bool;

diff --git a/modules/codec/csri.c b/modules/codec/csri.c
index 817f5d0dbd51672d683ed07427b151e5c9fcff9f..780108d24f9b59b16335d93e71770d2a5e2de054 100644 (file)
--- a/modules/codec/csri.c
+++ b/modules/codec/csri.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "config.h"
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/cvdsub.c b/modules/codec/cvdsub.c
index cbd436500d3aa1d118ee7f1acc89f6bfae1d0ff4..119a327a18b665efe7c5bfc6069c4126c24e7d5b 100644 (file)
--- a/modules/codec/cvdsub.c
+++ b/modules/codec/cvdsub.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c
index 8c7818a1a9af8b1204b596ca09ad5d14be54a8a5..6f2905a4ff627030c45ba749d91f5c2c7958a08b 100644 (file)
--- a/modules/codec/dirac.c
+++ b/modules/codec/dirac.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_sout.h>

diff --git a/modules/codec/dmo/buffer.c b/modules/codec/dmo/buffer.c
index a1f7e4018d34b81db85479b3baf2f63c19cd680a..321709df219adb552a9ec4c0ce392b698c022a55 100644 (file)
--- a/modules/codec/dmo/buffer.c
+++ b/modules/codec/dmo/buffer.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>
 

diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index 96130ed9c19c8a0306cf1457eb7f63d401ac286f..48d358de768cad77cc6ed9e41adaa9a6bf3cd01b 100644 (file)
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>

diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index b1dd63be8b2513a5243c666f348e0101a1f62ba5..7787cf4d29be93aedc693e7f4079ab5ab5655d72 100644 (file)
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_aout.h>

diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index ddb011efebd51a0ebabb6298515dd790d7f28755..258d01c33afe259afc96e1af7cbe96b9e81a9e00 100644 (file)
--- a/modules/codec/dvbsub.c
+++ b/modules/codec/dvbsub.c
@@ -43,7 +43,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 0228795330f88034490e8b36e6755588f0df3673..7af61bc7f092c271e143a51843a31c37f69a72ce 100644 (file)
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/fake.c b/modules/codec/fake.c
index eddb2b0cc323ae6d350609af3e48404ab9f65203..6c47a525b16ead386c3496f0e11fbaa9a95dfe2a 100644 (file)
--- a/modules/codec/fake.c
+++ b/modules/codec/fake.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 

diff --git a/modules/codec/ffmpeg/audio.c b/modules/codec/ffmpeg/audio.c
index 4065c29298e74486261363794b03a40807f1a931..a8f8708d180389c9511eeea3b37f44d2090235a9 100644 (file)
--- a/modules/codec/ffmpeg/audio.c
+++ b/modules/codec/ffmpeg/audio.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>
 #include <vlc_input.h>

diff --git a/modules/codec/ffmpeg/chroma.c b/modules/codec/ffmpeg/chroma.c
index 50c1ab177409f76decb0ee9a0d0bb54dd6acc7f0..148c07d1f072750712dd220c1c827fcb103a1fc1 100644 (file)
--- a/modules/codec/ffmpeg/chroma.c
+++ b/modules/codec/ffmpeg/chroma.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 
 #if defined(HAVE_LIBSWSCALE_SWSCALE_H)  || defined(HAVE_FFMPEG_SWSCALE_H)

diff --git a/modules/codec/ffmpeg/deinterlace.c b/modules/codec/ffmpeg/deinterlace.c
index bb842c2d6a465b7328679b9b5268d3869acc4d4a..83e117cc0c5f58e710a9135aa08ab7ef22219779 100644 (file)
--- a/modules/codec/ffmpeg/deinterlace.c
+++ b/modules/codec/ffmpeg/deinterlace.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>
 #include <vlc_filter.h>

diff --git a/modules/codec/ffmpeg/demux.c b/modules/codec/ffmpeg/demux.c
index cf5a54274b774074edf4f0ee9898bcd27abd4dd5..88610014c4837b67fac26520c6e262ed82ff3391 100644 (file)
--- a/modules/codec/ffmpeg/demux.c
+++ b/modules/codec/ffmpeg/demux.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 #include <vlc_stream.h>
 #include <vlc_meta.h>

diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c
index ea413d3b908d8883e04046f5e20dd31fde0715e8..85678d273cba62c7256f17cc79ef0b626109f9fe 100644 (file)
--- a/modules/codec/ffmpeg/encoder.c
+++ b/modules/codec/ffmpeg/encoder.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_aout.h>
 #include <vlc_sout.h>

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 69dca5425c28b14da6c0a89c70e34ed5603ce3b7..54f5d8f86fac25d52fa42f0322987269c11e1cf0 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 

diff --git a/modules/codec/ffmpeg/mux.c b/modules/codec/ffmpeg/mux.c
index 7ed78ad357492161de79c68754c422817518f15b..94aa1b9d85a8e8452f841f8faa4d6b205bcd55ac 100644 (file)
--- a/modules/codec/ffmpeg/mux.c
+++ b/modules/codec/ffmpeg/mux.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_block.h>
 #include <vlc_sout.h>
 

diff --git a/modules/codec/ffmpeg/postprocess.c b/modules/codec/ffmpeg/postprocess.c
index 832b78a9e8ef7f9ff85733a93930f3e8aec9b270..24b27f04209610285e0e2f0d13773801ee885e5e 100644 (file)
--- a/modules/codec/ffmpeg/postprocess.c
+++ b/modules/codec/ffmpeg/postprocess.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>
 

diff --git a/modules/codec/ffmpeg/scale.c b/modules/codec/ffmpeg/scale.c
index d860e645091457d073b2fa7a707612bf65831dba..e7f869e7d4c5b13e213ef675ad154db3d6148812 100644 (file)
--- a/modules/codec/ffmpeg/scale.c
+++ b/modules/codec/ffmpeg/scale.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>
 #include <vlc_filter.h>

diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c
index ce2f492eafbfed6211a2496cf0e082fca8c89480..ff0b2a09652888bc15f24ef5a61733b1d60a0a22 100644 (file)
--- a/modules/codec/ffmpeg/video.c
+++ b/modules/codec/ffmpeg/video.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>
 #include <vlc_input.h>                  /* hmmm, just for INPUT_RATE_DEFAULT */

diff --git a/modules/codec/ffmpeg/video_filter.c b/modules/codec/ffmpeg/video_filter.c
index 35f5124ee354e9df11b6f2100bf7eb9b8ab16b9f..857f62478058fd78b663d52b96c0b512fd8033c1 100644 (file)
--- a/modules/codec/ffmpeg/video_filter.c
+++ b/modules/codec/ffmpeg/video_filter.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>
 #include <vlc_filter.h>

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 4f9e4ef9fa3b41fa850dd6de5a4f478dfd1d68ea..0f9620a986a836e7e9c460c31c8ff58861472082 100644 (file)
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_aout.h>

diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index cf00836af2afda4af6ef1a82999c431d17fbb8b1..07648b7b660c086ac3f7e872711362971e61ca88 100644 (file)
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -23,7 +23,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index c6244e278efb58e4cd4d202e9bfce1844fe18878..90da151519ea732c4833116e42e150f3d76489ee 100644 (file)
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index 51ed378bbc0347ed35960ad2c9a5fe46032de1c4..72ea9562c7fe2b1e684bc8288b1dc3b0c16bea73 100644 (file)
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index e7c43885fe65b44bf2f2903b4b92f566d927eedf..6827db40c1b4f2e060b3c2ba9b15286f9cdf5c19 100644 (file)
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_aout.h>

diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp
index b188e68d46b6b4865f1106d11158ee1acd49b86b..244ee101fd446a6cc2fb8f8aef37cfa9932ef774 100644 (file)
--- a/modules/codec/mash.cpp
+++ b/modules/codec/mash.cpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>

diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index 88b1a5260845be90f4e3fc63ca1204f22dd7c649..9333b30a5682ed1213163e24b50f644c81641181 100644 (file)
--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_aout.h>

diff --git a/modules/codec/png.c b/modules/codec/png.c
index af223517b95e1fd4bea10e9381c7176a9bbd6e76..2b04b965ea53f494e3c8b96cf360799506a1b1c3 100644 (file)
--- a/modules/codec/png.c
+++ b/modules/codec/png.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>

diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c
index 345872bbacaf42e7cc38bf77bd2e8cc1ff7440b5..b5e9c19c8f7ccca214eb7f315a10042550477c44 100644 (file)
--- a/modules/codec/quicktime.c
+++ b/modules/codec/quicktime.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>

diff --git a/modules/codec/rawvideo.c b/modules/codec/rawvideo.c
index 9c5c5484de09672cbe620b243377235fde5c5c57..ccca3fa6c574e7a622d4a6a13134b0aebc5549b1 100644 (file)
--- a/modules/codec/rawvideo.c
+++ b/modules/codec/rawvideo.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>

diff --git a/modules/codec/realaudio.c b/modules/codec/realaudio.c
index 3f8ce5fab910b37e99840d28af04edfd776b094b..1eb45e08877f27cf83b485cef1ec756d8747147d 100644 (file)
--- a/modules/codec/realaudio.c
+++ b/modules/codec/realaudio.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/sdl_image.c b/modules/codec/sdl_image.c
index e638e37707f0921d419534c871bfeb68915fab94..82022e8873ebecde84bfd913f6e2901ebe3b4684 100644 (file)
--- a/modules/codec/sdl_image.c
+++ b/modules/codec/sdl_image.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>

diff --git a/modules/codec/speex.c b/modules/codec/speex.c
index f1a79ceb9e140fe5ee4abd04be45e20805d5e73e..d30b688f85b26c34bbe35e1222393ae2c420ab6c 100644 (file)
--- a/modules/codec/speex.c
+++ b/modules/codec/speex.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/spudec/parse.c b/modules/codec/spudec/parse.c
index ee7f4b73cb0455a1b69d17c372f7a2a135990af7..1b0f7b221bf08f6e141183879070515046cc2479 100644 (file)
--- a/modules/codec/spudec/parse.c
+++ b/modules/codec/spudec/parse.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>
 

diff --git a/modules/codec/spudec/spudec.c b/modules/codec/spudec/spudec.c
index 71dc6ef69a7b977fc17a4aa230f594919c1b4c4f..738539196958770da39620022b371a7a9151bf2a 100644 (file)
--- a/modules/codec/spudec/spudec.c
+++ b/modules/codec/spudec/spudec.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 

diff --git a/modules/codec/subtitles/subsdec.h b/modules/codec/subtitles/subsdec.h
index adc6b97b47cfbb5c6b2c14738bb1cb2bcea41b75..2c221ca95dc09e18dd64f6b2435888604ef56e6d 100644 (file)
--- a/modules/codec/subtitles/subsdec.h
+++ b/modules/codec/subtitles/subsdec.h
@@ -27,7 +27,7 @@
 #ifndef SUBSDEC_HEADER_H
 #define SUBSDEC_HEADER_H
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_input.h>

diff --git a/modules/codec/subtitles/t140.c b/modules/codec/subtitles/t140.c
index 5a6000fc0d09939610b4cb8f46d515a4d15ef05a..01b31629c641c5a282ac73677497abb68afc3d62 100644 (file)
--- a/modules/codec/subtitles/t140.c
+++ b/modules/codec/subtitles/t140.c
@@ -23,7 +23,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index 775a7fca86b9ed10f7e3c586cbaa146f7c919a46..6e39aa4817851e7acf0fb02ecaf7672aeb07febf 100644 (file)
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_osd.h>

diff --git a/modules/codec/tarkin.c b/modules/codec/tarkin.c
index 82b24fb103c67e1204a097025468be26a7914bdc..a408ba9cc7e5666571a0f11b0078a2e15bbfd862 100644 (file)
--- a/modules/codec/tarkin.c
+++ b/modules/codec/tarkin.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>

diff --git a/modules/codec/telx.c b/modules/codec/telx.c
index 87b9424694bbc493a36620bc3736016630917576..dbeda2d8bfeaeb11e65025bb7afaadb01320a26a 100644 (file)
--- a/modules/codec/telx.c
+++ b/modules/codec/telx.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <assert.h>
 #include <stdint.h>

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index dffc28d2216befbc3410b3925a38860ac5fbb41c..95f9a873702c51b35973803cfa7ace0fd8acbcc1 100644 (file)
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index cdd8251a72d7a5b8ddf1c3687f0063e58d0c479e..9ff2dbe669bc242981e840b5428351ecaab0fef4 100644 (file)
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_sout.h>

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index a9a7784417a8934d460e37744e9b88869ee78194..9555be013217fd9abfb5e1fb466356e6e2c7807f 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_aout.h>

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 49c2081979329760323e67646fd017392d75769d..5ff5c10c82a4a61a4bef6dd42f885aceb91200f4 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_sout.h>

diff --git a/modules/codec/xvmc/decode.c b/modules/codec/xvmc/decode.c
index 26c535bff1eac0eff51efdf3613165d7783e5462..c781c16830e75a8380803014660a974f46b69589 100644 (file)
--- a/modules/codec/xvmc/decode.c
+++ b/modules/codec/xvmc/decode.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 
 #include "xxmc-config.h"

diff --git a/modules/codec/xvmc/header.c b/modules/codec/xvmc/header.c
index b2759479724d95b0a10de2292c7952a65dad7b9d..51e0f7cd9201771f0e91301250d80ee46827dc39 100644 (file)
--- a/modules/codec/xvmc/header.c
+++ b/modules/codec/xvmc/header.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <inttypes.h>
 

diff --git a/modules/codec/xvmc/slice_xvmc_vld.c b/modules/codec/xvmc/slice_xvmc_vld.c
index 0d0e96e95d1c7b01b37f3bf586cd8ceca37daf44..ce2bf749440731289be57142f7e144e5f957d38e 100644 (file)
--- a/modules/codec/xvmc/slice_xvmc_vld.c
+++ b/modules/codec/xvmc/slice_xvmc_vld.c
@@ -21,7 +21,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>
 

diff --git a/modules/codec/xvmc/xxmc.c b/modules/codec/xvmc/xxmc.c
index 31420b3a4dc3677c8f26ff7b7152b4207acfec52..47adf0cd2be0ee5ec474b1815c675651cf07c4da 100644 (file)
--- a/modules/codec/xvmc/xxmc.c
+++ b/modules/codec/xvmc/xxmc.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 7800ac70011b4770d9fafe2acc4b360152eb957f..dce7fea0aa5e53884f63f44c1dfbeca3ac510a3e 100644 (file)
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -41,7 +41,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <assert.h>
 #include <stdint.h>

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index a69e126a0a082f7dae203041d05f23649139e6d3..64218720874beea7affd581d6b7f4c1fad1e63c8 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -47,7 +47,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_interface.h>

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index e92624657b523a0b02782c302c5acd6e1b11e468..d2d02dfafc685d09976bd4f291b462bbdf7bb693 100644 (file)
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 27993b1b5366aaaa8d480228703ef61e559b1ecb..fe22dba2832378faa59b9d7c595c3a61e06a0db5 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>

diff --git a/modules/control/http/http.h b/modules/control/http/http.h
index 6a3badb4fa33c87294d8505e4aecca237393c7a0..9f550237002afa73d4382377108f9f233c5155fe 100644 (file)
--- a/modules/control/http/http.h
+++ b/modules/control/http/http.h
@@ -29,7 +29,7 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <stdlib.h>
 #include <strings.h>
 #include <ctype.h>

diff --git a/modules/control/http/util.c b/modules/control/http/util.c
index d9699ccde25fe2d11ae8b2ee3c0431c1efa60706..c107d2e0d29c6c22bdffad8db7373e1b3c865054 100644 (file)
--- a/modules/control/http/util.c
+++ b/modules/control/http/util.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "http.h"
 #include "vlc_strings.h"
 

diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index 88eb631fe3597977e1be62248bfad9eb6d46f2e9..1951c1751a495d5e5dcba6e129621ffd53e65b5b 100644 (file)
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_osd.h>

diff --git a/modules/control/motion.c b/modules/control/motion.c
index 6acb8369fd8d60983c4d5331bfee39f4c8722743..ccecf4d0829637af6728c253c20afbb0d3e7e183 100644 (file)
--- a/modules/control/motion.c
+++ b/modules/control/motion.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index ebe409dfae4748215bc2b3bd2a321bc08a7b61bb..8be09774b1e4104c626d0226ab742345829795a1 100644 (file)
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>

diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c
index 6a6c10e88f791394e95ffda160837469e85f95bd..52aa47c1ac58483f90bab2af55d918ad77f6c03b 100644 (file)
--- a/modules/control/ntservice.c
+++ b/modules/control/ntservice.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 

diff --git a/modules/control/rc.c b/modules/control/rc.c
index b16130b22bd2c7cf976ff8ae6d34c09bf74fd2b3..e3485b8f5bee9ad64221ee214ca096a866e77a33 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <errno.h>                                                 /* ENOMEM */

diff --git a/modules/control/showintf.c b/modules/control/showintf.c
index b1c94f05a0a2e7e595dbbfd66649f3436c70c331..73dfe908fd7986d9eeec8602bf1a57fa9e88a263 100644 (file)
--- a/modules/control/showintf.c
+++ b/modules/control/showintf.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>

diff --git a/modules/control/signals.c b/modules/control/signals.c
index deb098409dc5c8dc3625fa126f6249d434a06169..6d9c87e3ff72a0986f10901b41387968abbfe7cc 100644 (file)
--- a/modules/control/signals.c
+++ b/modules/control/signals.c
@@ -26,7 +26,7 @@
 #include <signal.h>
 #include <time.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 

diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index 6e90ca020f475433098bfe304ffd21b15ae52028..e7bb2e19c9d60fd35d1c61b92dbf5e718f3bfbda 100644 (file)
--- a/modules/control/telnet.c
+++ b/modules/control/telnet.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>

diff --git a/modules/demux/a52.c b/modules/demux/a52.c
index 6b986621a22976d74ad51b07a51182ce6316198b..fc675a52df3fbbc78e74950c1e6eb3be5dfd6f51 100644 (file)
--- a/modules/demux/a52.c
+++ b/modules/demux/a52.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_codec.h>

diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c
index 5d31a37f3191606f3738096e83843a2faacc0111..afc8ee95ab88e3d84aac0a174e1b538090f78a24 100644 (file)
--- a/modules/demux/aiff.c
+++ b/modules/demux/aiff.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/asademux.c b/modules/demux/asademux.c
index e9141539f9f4c2713722740b425c504c46fe1a97..81dbd88d6a2bf5c075f6d9681e7c78ea49584873 100644 (file)
--- a/modules/demux/asademux.c
+++ b/modules/demux/asademux.c
@@ -32,7 +32,7 @@
  * base commit d8c269b0fae9a8f8904e16e92313da165d664c74
  ****************************************************************************/
 #include "config.h"
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 9e1f80b53ff4d628db9381c634e9258623d0576f..49a365d26321120399b4ea26a97b82076c8b106f 100644 (file)
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_interface.h>

diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index 144ce645e4f3dc7e44e403f3a582beae61601e5d..bf896df10f06040784548e782be30fef4eb75aa9 100644 (file)
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 
 #include <vlc_demux.h>

diff --git a/modules/demux/au.c b/modules/demux/au.c
index ef37741f0bee729c4020330cfe90938ce6638fd4..58da050f6175464eaebb058ac23be30221b76a0f 100644 (file)
--- a/modules/demux/au.c
+++ b/modules/demux/au.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index ab34db7848d2a74412602211f0b8d5438dc7458d..1d7b6b7dcfc3a3fa9875c2b2774524f5cd4e2049 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index 4d8a01962d82a080a7c1af8c5d22faba6c67d4d2..b91f0708421c7f3f54abda591f0de17eb4a7c71f 100644 (file)
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 #include <vlc_codecs.h>                                /* BITMAPINFOHEADER */
 

diff --git a/modules/demux/cdg.c b/modules/demux/cdg.c
index b4b49c4fbbad850a1d186fb78527788a26413e6d..d2fc7899126b5d4acc50a4aabe74f768cb9e717f 100644 (file)
--- a/modules/demux/cdg.c
+++ b/modules/demux/cdg.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index 0b7ba6ac26efb2b1adbd6173b2352c718f911879..93d695dd18dfa63ba965ba3b7884fa5c9ddf3cc2 100644 (file)
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_charset.h>

diff --git a/modules/demux/dts.c b/modules/demux/dts.c
index 91ddf43160e7395089e6cb34f4b41f8c680e3ddb..4b00f3a9c2eedd16c74b74d516c948e7197d437c 100644 (file)
--- a/modules/demux/dts.c
+++ b/modules/demux/dts.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_codec.h>

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 4301df048e7ff47395031f336cab77bbe9a7ad74..18f6d88a6f9a48dcba7bac4a35b3fe2856359d7d 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_meta.h>

diff --git a/modules/demux/gme.cpp b/modules/demux/gme.cpp
index 284ffb0c5c3575d9762194d2fbe7cc11aefcaa7e..de1c285d0f6c8a1bf230d2fbaed9f49810601f63 100644 (file)
--- a/modules/demux/gme.cpp
+++ b/modules/demux/gme.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include "Nsf_Emu.h"

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index da9e56daef0097abf049eee7afcf936550a4f871..5c9ec8617319e322b3fbb3defb26e08a551c5ed1 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -38,7 +38,7 @@
 
 #include <inttypes.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <vlc_demux.h>

diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index b090c53b7f851b15a5b7a4b0228f7e3c2ce3ea46..165b415084f4fa34e96b4b29ec17bf2e95a99e96 100644 (file)
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 23fe44f385178b4e6485cba18fdcd7dd72c6e4b4..c0022af1e2612565412ef9ef58bef57bf0da6056 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -37,7 +37,7 @@
 
 #include <inttypes.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #ifdef HAVE_TIME_H

diff --git a/modules/demux/mod.c b/modules/demux/mod.c
index 759e79f66c620c00738b24f1406379896b03b233..126119927982e59ddd794ffef96e1981934ec43e 100644 (file)
--- a/modules/demux/mod.c
+++ b/modules/demux/mod.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index 4601f093e38822a4422171091540d6313c4c8c05..ecc6fa19bdebb7452a06e0355085aea56090b906 100644 (file)
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#   include <vlc/vlc.h>
+#   include <vlc_common.h>
 #   include <vlc_md5.h>
 #   include "libmp4.h"
 #   include <vlc_charset.h>

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 43be5994c8a38c02780f273d86766eafa91ae91a..52665b01df6962b126928daac9f65f2f99f79ce9 100644 (file)
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 
 #include <vlc_demux.h>

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 826c088d5cec423cb0cc761c2dd907cf9a23b7a4..85924a2745ea49470db63a0845f2db7b92d3fae8 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 

diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c
index 991842a40fb884b1c2df1eeade2d19ca24582a67..d6d4ed3ea4378a28be242009694cd1cb0b7044e4 100644 (file)
--- a/modules/demux/mpc.c
+++ b/modules/demux/mpc.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_input.h>

diff --git a/modules/demux/mpeg/h264.c b/modules/demux/mpeg/h264.c
index e04f80c4e8a672091e6d9bf5ca97938818331b9a..724c05dc2cbc855fbf46c0366d63deb5a0a7a517 100644 (file)
--- a/modules/demux/mpeg/h264.c
+++ b/modules/demux/mpeg/h264.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include "vlc_codec.h"

diff --git a/modules/demux/mpeg/m4a.c b/modules/demux/mpeg/m4a.c
index 66a7e4d813efc9d4c3f6f96932e384a9ac7517aa..f1aa237ef9b6874e747094bbca24f08a5a06420d 100644 (file)
--- a/modules/demux/mpeg/m4a.c
+++ b/modules/demux/mpeg/m4a.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_codec.h>

diff --git a/modules/demux/mpeg/m4v.c b/modules/demux/mpeg/m4v.c
index e3a10d0915ac0e9f458c7d7ce5b963cfad364cae..e98e2596194488674f85031499b86e3e46823e0a 100644 (file)
--- a/modules/demux/mpeg/m4v.c
+++ b/modules/demux/mpeg/m4v.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include "vlc_codec.h"

diff --git a/modules/demux/mpeg/mpga.c b/modules/demux/mpeg/mpga.c
index c28bb87e5146b6e81ef1d61aa0c887f8051ca236..cd243307b963a2e74af8560b11a020e129f40da0 100644 (file)
--- a/modules/demux/mpeg/mpga.c
+++ b/modules/demux/mpeg/mpga.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_codec.h>

diff --git a/modules/demux/mpeg/mpgv.c b/modules/demux/mpeg/mpgv.c
index 61440cbc34f7f71224abcb1d010a844c831b1bd4..6e3df761770eae49567bfca00d8a334bfb49aa09 100644 (file)
--- a/modules/demux/mpeg/mpgv.c
+++ b/modules/demux/mpeg/mpgv.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_codec.h>

diff --git a/modules/demux/nsc.c b/modules/demux/nsc.c
index 0a46759e793b39815d13a320b8e84052071537d0..af8691a812fedc695d11f8b936080efafea696a4 100644 (file)
--- a/modules/demux/nsc.c
+++ b/modules/demux/nsc.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_playlist.h>

diff --git a/modules/demux/nsv.c b/modules/demux/nsv.c
index a8db05258fbf2b682d63c5b78b4edd54101d8382..0e35e162960834db99261dedf247f10eaa6bd1ad 100644 (file)
--- a/modules/demux/nsv.c
+++ b/modules/demux/nsv.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/nuv.c b/modules/demux/nuv.c
index 8a09f5a89b7b6ae14536029fad021efe2d39c0a9..b55f3c1f19bfdf0a973fa379f47a46bd4aec69c3 100644 (file)
--- a/modules/demux/nuv.c
+++ b/modules/demux/nuv.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 050da9e193c8df91ac6b57a58f4fea09dbe86ea9..907629faad5ddc482fb8132cd7f5c3bae84242b6 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_meta.h>

diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index 30d056ea6804fdfa9fb7b52b620fb9b2be56fa62..f79ada6bce2e93361276599cfda11a47f228abae 100644 (file)
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include <ctype.h>

diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index a465071d670161beb370504bd0c7e1637aff93c8..0f533c945c7baafb6416fe0cd44afad50ed9fd82 100644 (file)
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 #include <vlc_interface.h>
 

diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index 098ea55085fe7a0e643df6105210dc558039319d..2e1f4b2694df03423653b96700bcdeddf5c93c27 100644 (file)
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 #include <vlc_interface.h>
 #include <vlc_charset.h>

diff --git a/modules/demux/playlist/gvp.c b/modules/demux/playlist/gvp.c
index 83c982516aef1f15f19929833a275cdcc1fd7bce..3dbaaf8d5ad35e0c62b4e4e403b8b579013b2b39 100644 (file)
--- a/modules/demux/playlist/gvp.c
+++ b/modules/demux/playlist/gvp.c
@@ -52,7 +52,7 @@ description:The now infamous Apple Macintosh commercial aired during the 1984 Su
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "playlist.h"

diff --git a/modules/demux/playlist/ifo.c b/modules/demux/playlist/ifo.c
index c9108d9a223cbd2e6ecdc073d21aa86d951789f5..c961ad2e6bd93fea1c15adf2910bb08cebe38bc8 100644 (file)
--- a/modules/demux/playlist/ifo.c
+++ b/modules/demux/playlist/ifo.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "playlist.h"

diff --git a/modules/demux/playlist/itml.c b/modules/demux/playlist/itml.c
index 3924c2a5e71bd7bc26045a2f7154ea41531ddb3b..097d375c335bca22e119c453f4ba80c5045b07cd 100644 (file)
--- a/modules/demux/playlist/itml.c
+++ b/modules/demux/playlist/itml.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "playlist.h"

diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c
index 46fb85f922fc6537e74739089814167b90c23563..8ae097ddaae3a88041f9ff85f00095017bb95352 100644 (file)
--- a/modules/demux/playlist/m3u.c
+++ b/modules/demux/playlist/m3u.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 #include <vlc_charset.h>
 

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 2ffd120bf93dc8262e03dd9a1a71f39d5b461895..5009a61ce1874c9e9061ec2fb39b6d39e5bd22b7 100644 (file)
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_playlist.h>

diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c
index 191eca772187249633dd158da09f52ff309085da..bd382b6f82d3f2f7e64f44ff4ba879a7196eb556 100644 (file)
--- a/modules/demux/playlist/pls.c
+++ b/modules/demux/playlist/pls.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "playlist.h"

diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index 9866d7bf3e972cf4133cb01cb3bd3d345ba0a87a..c035f10d850a251114fd416e08bb61a1e7aba52e 100644 (file)
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "playlist.h"

diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c
index 3d3748ef8d11dbcc2bc8103cf4760fb930843a44..de90f20ad7b59d89f52ef63995766c47649887f0 100644 (file)
--- a/modules/demux/playlist/qtl.c
+++ b/modules/demux/playlist/qtl.c
@@ -52,7 +52,7 @@ volume - 0 (mute) - 100 (max)
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "playlist.h"

diff --git a/modules/demux/playlist/sgimb.c b/modules/demux/playlist/sgimb.c
index f6552fec816d3bd6444d03190f5b47c2edba35c8..db9f8d3920cae89eaab10da5981b9f47d6403441 100644 (file)
--- a/modules/demux/playlist/sgimb.c
+++ b/modules/demux/playlist/sgimb.c
@@ -102,7 +102,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 #include "playlist.h"
 

diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index 2ba221783ffd1342898004376ba5604c1ef9c885..355e9c7531d9852355a019f04cf637a3db841885 100644 (file)
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "playlist.h"

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index e3387d031c3dc8046881a6161a0ef01c593ea7f2..c805803dfe571ef2552d8d168b278979873d3f91 100644 (file)
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "playlist.h"

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index 956fc0824eb6a84596cab8ad5f6c0df386bd0908..d2db608b83e508b901808a4e57433f98fe851c5a 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/pva.c b/modules/demux/pva.c
index 1dfa65ad7b911f8757b4dbb8138f31df52ba8300..cb0d46ed3702327bae081bc4eaedf76f71f9cc4d 100644 (file)
--- a/modules/demux/pva.c
+++ b/modules/demux/pva.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c
index 47ba7cb48364e0ebf2de5bbddcb089b5bef02292..627220aee6f157175939ddaa62a21ddbdf82e485 100644 (file)
--- a/modules/demux/rawdv.c
+++ b/modules/demux/rawdv.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/demux/rawvid.c b/modules/demux/rawvid.c
index 82c178ef6fa0a6cb4a445d2aa6eebb5590cb77a3..ca6d8eb92861bdb641d542925fe81bf3ef239835 100644 (file)
--- a/modules/demux/rawvid.c
+++ b/modules/demux/rawvid.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_vout.h>                                     /* vout_InitFormat */

diff --git a/modules/demux/real.c b/modules/demux/real.c
index cb683debcde7be45fbb491175be2cba79bc1b3a6..00b2a413658120b8fc3a70b08d0f3c14ff147cbb 100644 (file)
--- a/modules/demux/real.c
+++ b/modules/demux/real.c
@@ -49,7 +49,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 

diff --git a/modules/demux/smf.c b/modules/demux/smf.c
index dbf6884d46d96bf1ae45009c06cf615d12521fd8..baaf5aebb475e9b04ee17546a9c4ffe7401dd70f 100644 (file)
--- a/modules/demux/smf.c
+++ b/modules/demux/smf.c
@@ -23,7 +23,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_aout.h>

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index 48486623b917183ff75517d4143a6116e5e39f32..46f26534bec8b057cc4ce200e853118565a0b0fc 100644 (file)
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 

diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c
index 65d257a5bbc1a9baac13a66b0be22e4a0ba20e17..cd6f4f79ee8afb8bb1a0f416b0c6424b8f85783b 100644 (file)
--- a/modules/demux/subtitle_asa.c
+++ b/modules/demux/subtitle_asa.c
@@ -30,7 +30,7 @@
  * Preamble
  *****************************************************************************/
 #include "config.h"
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 68a61c5925add1d497d47ce6c1ba17c4403da161..52acfd21e50a2ebae7ad5fb42bbe49037d7ecb93 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <ctype.h>

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index 9027add820718c9092d53ad8e37b18067ebc109e..42fda085f9708d3cad36a4218b3826b07e7b6d66 100644 (file)
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_codec.h>

diff --git a/modules/demux/ty.c b/modules/demux/ty.c
index af620291d740c660ea627f434b3acdcd997a330b..98d48ca831faf6188a136a6cb9e1f94c614c102f 100644 (file)
--- a/modules/demux/ty.c
+++ b/modules/demux/ty.c
@@ -39,7 +39,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include "vlc_codec.h"

diff --git a/modules/demux/vc1.c b/modules/demux/vc1.c
index 1f0b3a39ec5eb6d183b26202a71727200a4865d9..f6c7625067a37e692f8c2634a64e9c5bc8198114 100644 (file)
--- a/modules/demux/vc1.c
+++ b/modules/demux/vc1.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include "vlc_codec.h"

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index 72181012a1471c07b3d77927fda756173be83321..64c3570dd4d35edf09dc2b9a385c572f7decfc54 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <errno.h>

diff --git a/modules/demux/voc.c b/modules/demux/voc.c
index 34391585560065aec7698caaa2e0589dcddf2f17..e6c9356759bf5ea37f6bd1ce9a15e1afeff4cb3c 100644 (file)
--- a/modules/demux/voc.c
+++ b/modules/demux/voc.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_aout.h>

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index d688a4ad0accad253814a4804c770f6c5126798b..382b553836d76aaea63ba4767df3170695ce3a6f 100644 (file)
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_aout.h>

diff --git a/modules/demux/xa.c b/modules/demux/xa.c
index 8829427699d5ca4cff0b705efd7e8f92895e8f1f..b98a78ed8f47e6a585225fe6a61192ebb9997d2c 100644 (file)
--- a/modules/demux/xa.c
+++ b/modules/demux/xa.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 

diff --git a/modules/gui/beos/AudioOutput.cpp b/modules/gui/beos/AudioOutput.cpp
index a7b350296e03a8d2c9857bbee54a1363764cd7d0..a65c5cc00e392b9cd780ecebe89879e525b348cf 100644 (file)
--- a/modules/gui/beos/AudioOutput.cpp
+++ b/modules/gui/beos/AudioOutput.cpp
@@ -36,7 +36,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 extern "C"
 {

diff --git a/modules/gui/beos/BeOS.cpp b/modules/gui/beos/BeOS.cpp
index 4d6fbab7682598ffa4018c190dccc263fd42c432..c1dc7e84b1543a3baef5bffd2bbd497020589af6 100644 (file)
--- a/modules/gui/beos/BeOS.cpp
+++ b/modules/gui/beos/BeOS.cpp
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 /*****************************************************************************

diff --git a/modules/gui/beos/Interface.cpp b/modules/gui/beos/Interface.cpp
index 6c5773c16e221d66fafa9a4baf7c9e3fd3fe21d0..859c618e8a1d26374dd886338545c0f4e14e5b31 100644 (file)
--- a/modules/gui/beos/Interface.cpp
+++ b/modules/gui/beos/Interface.cpp
@@ -37,7 +37,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_aout.h>
 #include <aout_internal.h>

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index 555c6444adfd0f0ef64b1c6fc8ceb2f81d9cd24a..9e6a7dd730bd9931376693c7274e17246376e80d 100644 (file)
--- a/modules/gui/beos/InterfaceWindow.cpp
+++ b/modules/gui/beos/InterfaceWindow.cpp
@@ -41,7 +41,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_interface.h>
 

diff --git a/modules/gui/beos/ListViews.cpp b/modules/gui/beos/ListViews.cpp
index a7562f4d4d7bcfcaaad7f95b7b410cf82e9eeafc..ebe147674d411ecd5ed52e639a155ff01b55c4cb 100644 (file)
--- a/modules/gui/beos/ListViews.cpp
+++ b/modules/gui/beos/ListViews.cpp
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "InterfaceWindow.h"

diff --git a/modules/gui/beos/MediaControlView.cpp b/modules/gui/beos/MediaControlView.cpp
index 0902e521210b33142158d4280fa4cce9473ae78c..30c23e9d27230348c3a381c5e317b54260923337 100644 (file)
--- a/modules/gui/beos/MediaControlView.cpp
+++ b/modules/gui/beos/MediaControlView.cpp
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 extern "C"
 {

diff --git a/modules/gui/beos/MessagesWindow.cpp b/modules/gui/beos/MessagesWindow.cpp
index 32cdd0a43b3d8d9872091c026c1947f677e8011f..b4b202933004508353f3f7c23b2c3c7999ae58ec 100644 (file)
--- a/modules/gui/beos/MessagesWindow.cpp
+++ b/modules/gui/beos/MessagesWindow.cpp
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 /* BeOS module headers */

diff --git a/modules/gui/beos/PlayListWindow.cpp b/modules/gui/beos/PlayListWindow.cpp
index e73521cddaf01d1692ff2533dbfdcc4f9667655b..585523810d07063f59dc8a6a076b501506e069d1 100644 (file)
--- a/modules/gui/beos/PlayListWindow.cpp
+++ b/modules/gui/beos/PlayListWindow.cpp
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 /* BeOS interface headers */

diff --git a/modules/gui/beos/PreferencesWindow.cpp b/modules/gui/beos/PreferencesWindow.cpp
index 2d780294b6600314854477abc39ae9a496cc6d27..e033008742b098117a42c30d77e6b995811e4180 100644 (file)
--- a/modules/gui/beos/PreferencesWindow.cpp
+++ b/modules/gui/beos/PreferencesWindow.cpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_keys.h>
 #include <vlc_config_cat.h>

diff --git a/modules/gui/beos/VideoOutput.cpp b/modules/gui/beos/VideoOutput.cpp
index e74369a258d458f863bba3c4006683ae6aa3f98e..62a4ec676d6ae8467fbdb6fb2b45213878d0dfd3 100644 (file)
--- a/modules/gui/beos/VideoOutput.cpp
+++ b/modules/gui/beos/VideoOutput.cpp
@@ -47,7 +47,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>
 #include <vlc_keys.h>

diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c
index a886949d1e0038b6bc0e4a2b5ffdaf052b72e105..b861e87549baefbdda14a148ecca6c8227001bfd 100644 (file)
--- a/modules/gui/fbosd.c
+++ b/modules/gui/fbosd.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <errno.h>

diff --git a/modules/gui/macosx/bookmarks.h b/modules/gui/macosx/bookmarks.h
index 3cf21cb48009840a16cb4c179bd441f282ea7703..1f9e2beecd85c108bfcb192ac6c96a899e10b69f 100644 (file)
--- a/modules/gui/macosx/bookmarks.h
+++ b/modules/gui/macosx/bookmarks.h
@@ -23,7 +23,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import "intf.h"
-#import <vlc/vlc.h>
+#import <vlc_common.h>
 
 @interface VLCBookmarks : NSObject
 {

diff --git a/modules/gui/macosx/equalizer.m b/modules/gui/macosx/equalizer.m
index 63d5c3cf86bad4853a5cd9d2535010825966277a..1d02170dda3bee888cc42be042aacd9bf5d161d8 100644 (file)
--- a/modules/gui/macosx/equalizer.m
+++ b/modules/gui/macosx/equalizer.m
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 
 #include "intf.h"

diff --git a/modules/gui/macosx/extended.h b/modules/gui/macosx/extended.h
index e67798f9f9400bdab4e881ed50b92db2d5d3dda7..2af34bd032590cd88a6d77bca7d3cce7cfbb7c99 100644 (file)
--- a/modules/gui/macosx/extended.h
+++ b/modules/gui/macosx/extended.h
@@ -27,7 +27,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import "intf.h"
-#import <vlc/vlc.h>
+#import <vlc_common.h>
 
 @interface VLCExtended : NSObject
 {

diff --git a/modules/gui/macosx/interaction.h b/modules/gui/macosx/interaction.h
index aeae78254a954619ff385c46f6f30bc8c601e607..81bb98a738d8454240027627a0698bafd0cb34dd 100644 (file)
--- a/modules/gui/macosx/interaction.h
+++ b/modules/gui/macosx/interaction.h
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <Cocoa/Cocoa.h>
 

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index fa173e7ad332534f955adba196e3542417309991..f3272af0c1e55d0be42bf3e6832d58fd239f8d86 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -28,7 +28,7 @@
 #   include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_vout.h>

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 619ee5dc62f7f1dc7feb22f6480fcb5d268acbc3..5cf91505dc7059aa306bdacef9fa4386cfa81d2d 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 /*****************************************************************************

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 5fb77b6ac6405932484b7a46d2672879ab6b01b2..2e708b22cd76995f60298ecccbbb99097ef493ac 100644 (file)
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -50,7 +50,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_config_cat.h>
 
 #include "intf.h"

diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m
index 4b58ccea3d982af68682328d3c5761977df3044b..afa4c53b7eb30cfad6d2c5f12efdcd8b8c25d47a 100644 (file)
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_keys.h"
 
 #include "intf.h"

diff --git a/modules/gui/macosx/sfilters.h b/modules/gui/macosx/sfilters.h
index 4e30a6fd522da83e683ab0e76a9a2e14b7bdbebc..054590cd7684ef4984650e5cc6f6dc3eb9fb0fb0 100644 (file)
--- a/modules/gui/macosx/sfilters.h
+++ b/modules/gui/macosx/sfilters.h
@@ -23,7 +23,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import "intf.h"
-#import <vlc/vlc.h>
+#import <vlc_common.h>
 
 @interface VLCsFilters : NSObject
 {

diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index d6a58cdab93344451bd2a785f2dfee7eca3edd81..6f7d4643ce64dd7dd55cd687e8a1d056b443f1a0 100644 (file)
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -23,7 +23,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import "intf.h"
-#import <vlc/vlc.h>
+#import <vlc_common.h>
 
 @interface VLCSimplePrefs : NSObject
 {

diff --git a/modules/gui/minimal_macosx/VLCMinimalVoutWindow.h b/modules/gui/minimal_macosx/VLCMinimalVoutWindow.h
index 4dcc6c2989e3c1f4be6d0391b785b7ca89009dff..7e2fd2803937e11887830d6116a7e21d1a531f82 100644 (file)
--- a/modules/gui/minimal_macosx/VLCMinimalVoutWindow.h
+++ b/modules/gui/minimal_macosx/VLCMinimalVoutWindow.h
@@ -23,7 +23,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 @interface VLCMinimalVoutWindow : NSWindow
 {

diff --git a/modules/gui/minimal_macosx/VLCOpenGLVoutView.h b/modules/gui/minimal_macosx/VLCOpenGLVoutView.h
index ecea9c3ecd9069b453e2ace84741dd296d1e3c09..406887af3dcbd1c066ab5063af0cb21bc8e2c759 100644 (file)
--- a/modules/gui/minimal_macosx/VLCOpenGLVoutView.h
+++ b/modules/gui/minimal_macosx/VLCOpenGLVoutView.h
@@ -32,7 +32,7 @@
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 /* Entry point */
 int  cocoaglvoutviewInit( vout_thread_t * p_vout );

diff --git a/modules/gui/minimal_macosx/intf.h b/modules/gui/minimal_macosx/intf.h
index fd9e6b7240f482477b7dbee7e439fce02c550004..067205e93e7dd4dae5c23eaf53bcf139238567b3 100644 (file)
--- a/modules/gui/minimal_macosx/intf.h
+++ b/modules/gui/minimal_macosx/intf.h
@@ -28,7 +28,7 @@
 #   include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_vout.h>

diff --git a/modules/gui/minimal_macosx/intf.m b/modules/gui/minimal_macosx/intf.m
index 7ad564e4933ecacfaba84fc0e43fc14659abb8a6..e77012f31ed883e2689bf5bc2730aa5ed02d8711 100644 (file)
--- a/modules/gui/minimal_macosx/intf.m
+++ b/modules/gui/minimal_macosx/intf.m
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <vlc_keys.h>
 

diff --git a/modules/gui/minimal_macosx/macosx.c b/modules/gui/minimal_macosx/macosx.c
index 69c813e7e5c2967008e4c0eebbab0d77f368b514..76093ef793be640c72dbf38a8063c0d243f062ac 100644 (file)
--- a/modules/gui/minimal_macosx/macosx.c
+++ b/modules/gui/minimal_macosx/macosx.c
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 /*****************************************************************************

diff --git a/modules/gui/minimal_macosx/voutagl.h b/modules/gui/minimal_macosx/voutagl.h
index 013a307ddb3a30335a51b69bfd612f5dcacb9292..5720ae9d9a54603c88ccd2552de0c6add8792120 100644 (file)
--- a/modules/gui/minimal_macosx/voutagl.h
+++ b/modules/gui/minimal_macosx/voutagl.h
@@ -32,7 +32,7 @@
 
 #include <AGL/agl.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 int  aglInit   ( vout_thread_t * p_vout );
 void aglEnd    ( vout_thread_t * p_vout );

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 57313fd81ee5570ccd7d75de578901cb2ca71fc2..9a5cab88d166fb0b261c7c52f4f18667d6df9eef 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -38,7 +38,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #ifdef HAVE_NCURSESW

diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index 269675656e465bb9318e16b54b6f81ed108ee2d5..2cd24c144cda5c0e9cf9c3b24ff4a7121a22caec 100644 (file)
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>

diff --git a/modules/gui/pda/pda_callbacks.c b/modules/gui/pda/pda_callbacks.c
index fffa048b590fbf4633f26f5982e9f1ec766c0d81..e1a6d610c80d4197b40f9a8439964ae24b562dd5 100644 (file)
--- a/modules/gui/pda/pda_callbacks.c
+++ b/modules/gui/pda/pda_callbacks.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>

diff --git a/modules/gui/pda/pda_callbacks.h b/modules/gui/pda/pda_callbacks.h
index 546d8454ace8ea64aeef918ed3e30f472d6a7b21..d8563beb755bfc1c52c434393c2bacd58d6a7334 100644 (file)
--- a/modules/gui/pda/pda_callbacks.h
+++ b/modules/gui/pda/pda_callbacks.h
@@ -23,7 +23,7 @@
 
 #include <gtk/gtk.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 void ReadDirectory( intf_thread_t *p_intf, GtkListStore *p_list, char *psz_dir );

diff --git a/modules/gui/qnx/aout.c b/modules/gui/qnx/aout.c
index 2163edc35356ec98326d63c5826af2dbc2e21dfb..33accf21bb0a4a50be8eb9ee77eac90af678df4d 100644 (file)
--- a/modules/gui/qnx/aout.c
+++ b/modules/gui/qnx/aout.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #ifdef HAVE_ALLOCA_H
 #   include <alloca.h>

diff --git a/modules/gui/qnx/qnx.c b/modules/gui/qnx/qnx.c
index bd15bd19fb625fb92797c418c46a0bd18d880ea5..e07fb40cde2c7bc53f371c6fe018212c4d91ae9a 100644 (file)
--- a/modules/gui/qnx/qnx.c
+++ b/modules/gui/qnx/qnx.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 /*****************************************************************************

diff --git a/modules/gui/qnx/vout.c b/modules/gui/qnx/vout.c
index 58acda727110c0e24c26b0b3c65b18c662501834..bbb0a1cf7720c5778814e5c71943b6a045c632ba 100644 (file)
--- a/modules/gui/qnx/vout.c
+++ b/modules/gui/qnx/vout.c
@@ -35,7 +35,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>
 

diff --git a/modules/gui/qt4/components/complete_preferences.hpp b/modules/gui/qt4/components/complete_preferences.hpp
index a0b1f9a7287f7e266964786763d5a53740532c7c..6cde2e16ece783167d14a79ffe540a56c99bf8d4 100644 (file)
--- a/modules/gui/qt4/components/complete_preferences.hpp
+++ b/modules/gui/qt4/components/complete_preferences.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include <QTreeWidget>

diff --git a/modules/gui/qt4/components/extended_panels.hpp b/modules/gui/qt4/components/extended_panels.hpp
index 3d8bb637b5238283a0607a160f435e8df9b04e2e..e10d0870bf80f265f5a80fbeb4abeb5a9674cba3 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 
 #include "ui/equalizer.h"

diff --git a/modules/gui/qt4/components/info_panels.hpp b/modules/gui/qt4/components/info_panels.hpp
index 4fe657223c5e8cb51a9f4ba8c7db378e9f7d5e7f..e2efe66d7d966c0249c26fe27f1f8ed4d8f897f1 100644 (file)
--- a/modules/gui/qt4/components/info_panels.hpp
+++ b/modules/gui/qt4/components/info_panels.hpp
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_meta.h>
 
 #include <QWidget>

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index f81197bd18efb5a828190d5867e59e2b21a0bf4c..708599b1394d99b7601f2f1085f31d6031b7a1b7 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_aout.h>
 

diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 2f9cdd595bc943b2ac468014f7247e53d0568a15..d21a6429c1db75f250d38359bfee104e7dfb0c09 100644 (file)
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <QFileDialog>
 

diff --git a/modules/gui/qt4/components/playlist/panels.hpp b/modules/gui/qt4/components/playlist/panels.hpp
index 615ad2a57f20040f4771f2c827039067ad473477..f19e34424d4d476a215c39aac10eab1ac98479ba 100644 (file)
--- a/modules/gui/qt4/components/playlist/panels.hpp
+++ b/modules/gui/qt4/components/playlist/panels.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "qt4.hpp"
 #include "components/playlist/playlist.hpp"

diff --git a/modules/gui/qt4/components/playlist/playlist.hpp b/modules/gui/qt4/components/playlist/playlist.hpp
index 3144fc66bf5deb97bfd161beadabe8f9aa3c0de3..86fe50b2c2fc9c4fd3de824ef78c1360697f2fa0 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist.hpp
+++ b/modules/gui/qt4/components/playlist/playlist.hpp
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "qt4.hpp"
 #include "dialogs_provider.hpp"
 

diff --git a/modules/gui/qt4/components/playlist/playlist_item.hpp b/modules/gui/qt4/components/playlist/playlist_item.hpp
index 5f1b73de47199fe1d624ab58d160333dadcdce13..bd2b8d1049a4df60263bb99ccc6288b19e3caffa 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_item.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 #include "components/playlist/playlist_model.hpp"

diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index 28ce2708ccbc0a273b63049eab1a364b58469739..f6e4da874d86de424ddb5c5b59d04342b89d6d80 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 #include "playlist_item.hpp"

diff --git a/modules/gui/qt4/components/playlist/selector.hpp b/modules/gui/qt4/components/playlist/selector.hpp
index 7e98eff43c128e9ac1e9f40a44da6a060d4e567e..b6ff6e635f0de9b34829a2f5594adc88c7031814 100644 (file)
--- a/modules/gui/qt4/components/playlist/selector.hpp
+++ b/modules/gui/qt4/components/playlist/selector.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <QWidget>
 #include <QString>
 #include "components/playlist/playlist_model.hpp"

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index ee0bee11244fe01433e854f1addfd8502d14830b..9df5c6ac6fe11d0eb64493c69c404593f3e4d64e 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "qt4.hpp"
 #include <assert.h>

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index acd8763e8156c4f64155fd8b9d04d3a28bc203a4..3d18a992c42f564bfae7e579dc6905790c51507a 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <QWidget>
 

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 256988f4242650f1df84cd355fb78a4243a82d37..a968c5634e52e29d5a2d6004c4dcad3cbed63be8 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "dialogs/help.hpp"
 #include <vlc_about.h>

diff --git a/modules/gui/qt4/dialogs/interaction.hpp b/modules/gui/qt4/dialogs/interaction.hpp
index 1df4baaf6ac97613cd3721b28dc20980d44d1ebd..909e5bc613e620b7e31164064056d8c4fbd819d5 100644 (file)
--- a/modules/gui/qt4/dialogs/interaction.hpp
+++ b/modules/gui/qt4/dialogs/interaction.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include <QWidget>

diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index 3af33971fea61b3ea7a87a4a47301e57941f8e60..1f2a02583b24d3ae6b3e75539c45e5c374310bbc 100644 (file)
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "util/qvlcframe.hpp"
 #include "dialogs_provider.hpp"

diff --git a/modules/gui/qt4/dialogs/sout.hpp b/modules/gui/qt4/dialogs/sout.hpp
index 6947bbb855381592af98b3f00483a9ce5ec5bf56..c81f8d076407aab967475870ca7958484c22b4e2 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.hpp
+++ b/modules/gui/qt4/dialogs/sout.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_streaming.h>
 
 #include "ui/sout.h"

diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
index c3e3ba776bc5fc8b4885ec4eeb573a2f00e3b12d..10a53768908977af8583ae70088696306631054b 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.hpp
+++ b/modules/gui/qt4/dialogs/vlm.hpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #ifdef ENABLE_VLM
 

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 2e4df5887d0f2d6365ed1b246671be688022c7ae..c65f8d4ddb6580d07063520b3770df3e4cab32d5 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -30,7 +30,7 @@
 #include <QSignalMapper>
 #include <QFileDialog>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "qt4.hpp"
 #include "dialogs_provider.hpp"
 #include "main_interface.hpp"

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index f2ba2113e2dc851f3a3bd0622eaf6af28003aa89..0362d9550161d4afbe5bd2f3eee8008f70f9d8db 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -30,7 +30,7 @@
 #endif
 
 #include <assert.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "qt4.hpp"

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index b3ae1dea3b48774afda11206e47a29a1d0f4f861..9c6678f5aaaa67fe4814e0039429bf6403256049 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 
 #include "qt4.hpp"

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index d42f28bd78a7d1cec63495d7240fcf47774e11f2..21c294c09e253c9a278acbd8b22e1dc44ca1fb3e 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <vlc_intf_strings.h>
 

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index c06c5fb97325a20a5a9144a35bc6397c772315bb..181d28590da4d78731ab425ce25790bbff67591c 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 

diff --git a/modules/gui/qt4/util/qvlcframe.hpp b/modules/gui/qt4/util/qvlcframe.hpp
index 1fda84c74d36a32fa92404263671a6c5d75a3b23..d8f97ef7e2a6e85ad1dd7054a00be3ce9487148e 100644 (file)
--- a/modules/gui/qt4/util/qvlcframe.hpp
+++ b/modules/gui/qt4/util/qvlcframe.hpp
@@ -36,7 +36,7 @@
 #include <QDesktopWidget>
 
 #include "qt4.hpp"
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_charset.h>
 
 class QVLCTools

diff --git a/modules/gui/skins2/commands/cmd_add_item.cpp b/modules/gui/skins2/commands/cmd_add_item.cpp
index 7b9a97cbdcccc31687ac6294aa5183e2d12153a9..f90c188a1ed1d5f3bf7aac53667756dbcf161e89 100644 (file)
--- a/modules/gui/skins2/commands/cmd_add_item.cpp
+++ b/modules/gui/skins2/commands/cmd_add_item.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_playlist.h>
 #include "cmd_add_item.hpp"
 

diff --git a/modules/gui/skins2/parser/builder_data.hpp b/modules/gui/skins2/parser/builder_data.hpp
index d4ede19c75a8115ac9f017f44d05df446e14d1ae..4e1dd31c0be952e3acc9719e0f21b52cedae0543 100644 (file)
--- a/modules/gui/skins2/parser/builder_data.hpp
+++ b/modules/gui/skins2/parser/builder_data.hpp
@@ -28,7 +28,7 @@
 #ifndef BUILDER_DATA_HPP
 #define BUILDER_DATA_HPP
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <list>
 #include <map>
 #include <string>

diff --git a/modules/gui/skins2/parser/gen_builder.py b/modules/gui/skins2/parser/gen_builder.py
index 6fb88d05119b66a4e529e47bdc6758dbc164e2f5..2c0d4b25648b0893f7c1dbfb2962d114d26ee1e0 100755 (executable)
--- a/modules/gui/skins2/parser/gen_builder.py
+++ b/modules/gui/skins2/parser/gen_builder.py
@@ -41,7 +41,7 @@ hppfile.write(
 #ifndef BUILDER_DATA_HPP
 #define BUILDER_DATA_HPP
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <list>
 #include <map>
 #include <string>

diff --git a/modules/gui/skins2/src/file_bitmap.cpp b/modules/gui/skins2/src/file_bitmap.cpp
index 508c07be592803873777486bc6929d90f61d131f..a94af886579960447cc7a444cab16ce11212a527 100644 (file)
--- a/modules/gui/skins2/src/file_bitmap.cpp
+++ b/modules/gui/skins2/src/file_bitmap.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_image.h"
 #include "file_bitmap.hpp"
 

diff --git a/modules/gui/skins2/src/skin_common.hpp b/modules/gui/skins2/src/skin_common.hpp
index fc67f30272aabe930efebe139d33a5c5a75c30ae..ff169f9868e97ee0d7df9fc1fe96b43526200b92 100644 (file)
--- a/modules/gui/skins2/src/skin_common.hpp
+++ b/modules/gui/skins2/src/skin_common.hpp
@@ -29,7 +29,7 @@
 #ifndef SKIN_COMMON_HPP
 #define SKIN_COMMON_HPP
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include "vlc_charset.h"
 

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index 65e0ad20adfed0113d65f81115c62fb19747e537..1e63337292997a6c9474a29137ef90e18b4e20a2 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_demux.h>

diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index 39e94901fece8cf80b3bcc20bba3881632cc3ca1..a9eada9a976cf018372f4941a7ca9227ecf45648 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
 #include <vlc_playlist.h>

diff --git a/modules/gui/skins2/utils/bezier.cpp b/modules/gui/skins2/utils/bezier.cpp
index cc1b8f91dce5b6d86c9a4bba359945bee5d88117..defccf05aeb54d3ba28398da15aa559ba8b96327 100644 (file)
--- a/modules/gui/skins2/utils/bezier.cpp
+++ b/modules/gui/skins2/utils/bezier.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "bezier.hpp"
 #include <math.h>
 

diff --git a/modules/gui/skins2/vars/equalizer.cpp b/modules/gui/skins2/vars/equalizer.cpp
index bda212f6110274995cfee7e0c915fe6504075219..3600017df9090704b545c7e78788937098a1e531 100644 (file)
--- a/modules/gui/skins2/vars/equalizer.cpp
+++ b/modules/gui/skins2/vars/equalizer.cpp
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include "equalizer.hpp"
 #include "../utils/var_percent.hpp"

diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index 5a973dd1c7a96d299a7699cd74ee0092b4d3a708..a70677cc606d5ab588976887fd8468b7094ab780 100644 (file)
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "playtree.hpp"
 #include <vlc_playlist.h>

diff --git a/modules/gui/skins2/vars/volume.cpp b/modules/gui/skins2/vars/volume.cpp
index 335e9fd64f45eb01b8f5337ca01057523ba99a9f..9227a61abb9c8198d07df341e96268d4bdc540db 100644 (file)
--- a/modules/gui/skins2/vars/volume.cpp
+++ b/modules/gui/skins2/vars/volume.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include "volume.hpp"
 

diff --git a/modules/gui/wince/dialogs.cpp b/modules/gui/wince/dialogs.cpp
index ac7027b30a4d7d1548953f5a58c8397179ac3ba3..e3d581144aa71dc77adbad336d09bf586e6334c5 100644 (file)
--- a/modules/gui/wince/dialogs.cpp
+++ b/modules/gui/wince/dialogs.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_interface.h>
 

diff --git a/modules/gui/wince/fileinfo.cpp b/modules/gui/wince/fileinfo.cpp
index 7fafbc64b2949cb850126d00bd6fbae2876b930d..f6e1a49a239eb450a3db465db7115d43129fd225 100644 (file)
--- a/modules/gui/wince/fileinfo.cpp
+++ b/modules/gui/wince/fileinfo.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "wince.h"

diff --git a/modules/gui/wince/interface.cpp b/modules/gui/wince/interface.cpp
index 13e8aad20e112111e01094ab948af24fe7a7e3b2..854848ec3aeaadebfe4162b4463c8032c0cb692f 100644 (file)
--- a/modules/gui/wince/interface.cpp
+++ b/modules/gui/wince/interface.cpp
@@ -33,7 +33,7 @@
 #define __STDC_CONSTANT_MACROS 1
 #include <inttypes.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>

diff --git a/modules/gui/wince/iteminfo.cpp b/modules/gui/wince/iteminfo.cpp
index bfcd5a9dd232e01ba23c9549f56262702d546e31..5b4062370de868b2d1bbcc93ded3d088aa03d50f 100644 (file)
--- a/modules/gui/wince/iteminfo.cpp
+++ b/modules/gui/wince/iteminfo.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "wince.h"

diff --git a/modules/gui/wince/menus.cpp b/modules/gui/wince/menus.cpp
index d74e6b997adeb070f740ae9c2b1311587aabd0a0..5616fdb97dd95d09e7fa47f4c6b8f9b8db4f692a 100644 (file)
--- a/modules/gui/wince/menus.cpp
+++ b/modules/gui/wince/menus.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "wince.h"

diff --git a/modules/gui/wince/messages.cpp b/modules/gui/wince/messages.cpp
index d18f56d8435c0cf36fab112e2b19c6413e5100ca..c5338a0726c43d292dea0ad3e1f948f5e0286a75 100644 (file)
--- a/modules/gui/wince/messages.cpp
+++ b/modules/gui/wince/messages.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "wince.h"

diff --git a/modules/gui/wince/open.cpp b/modules/gui/wince/open.cpp
index 1761eac22fec638f6f9c83131c3e5255779d05c7..aa491429509856c883b4a226f470338d2c50aa11 100644 (file)
--- a/modules/gui/wince/open.cpp
+++ b/modules/gui/wince/open.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "wince.h"

diff --git a/modules/gui/wince/playlist.cpp b/modules/gui/wince/playlist.cpp
index 5a2b6fcc7243305612966b10464837ac400cc819..2a8f3eaedf38f9d8b41a0337c2c37469aa2dcef5 100644 (file)
--- a/modules/gui/wince/playlist.cpp
+++ b/modules/gui/wince/playlist.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "wince.h"

diff --git a/modules/gui/wince/preferences.cpp b/modules/gui/wince/preferences.cpp
index 39e026d5a8e787d7d9c01157457ff6c6133a49fc..87384778a47613688407f431c1559e7b220a5760 100644 (file)
--- a/modules/gui/wince/preferences.cpp
+++ b/modules/gui/wince/preferences.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "wince.h"

diff --git a/modules/gui/wince/preferences_widgets.cpp b/modules/gui/wince/preferences_widgets.cpp
index 636b5d58294bd77e9e208db8b254e8b2e42700ba..bdfefeadfb886f149912f11d83846cc5b1488cf4 100644 (file)
--- a/modules/gui/wince/preferences_widgets.cpp
+++ b/modules/gui/wince/preferences_widgets.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "wince.h"

diff --git a/modules/gui/wince/subtitles.cpp b/modules/gui/wince/subtitles.cpp
index 175e7e109d9cee5f2cc7c4bd9e0c39009150c0b8..2f1edb4206f5db8d9e9cb32480ef1423227a1fb4 100644 (file)
--- a/modules/gui/wince/subtitles.cpp
+++ b/modules/gui/wince/subtitles.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "wince.h"

diff --git a/modules/gui/wince/timer.cpp b/modules/gui/wince/timer.cpp
index f760771c1e1d5ce4df1103fa7a2301d5da03c66f..ea5425e48f8013ad6d2cdd687d563c22f1e6cbe0 100644 (file)
--- a/modules/gui/wince/timer.cpp
+++ b/modules/gui/wince/timer.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_interface.h>
 

diff --git a/modules/gui/wince/video.cpp b/modules/gui/wince/video.cpp
index 60bbda1be090baf41b905a6e477b601cd08d7584..6e307bae3ce777830b37fb58989f9ef7a15f0007 100644 (file)
--- a/modules/gui/wince/video.cpp
+++ b/modules/gui/wince/video.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>
 

diff --git a/modules/gui/wince/wince.cpp b/modules/gui/wince/wince.cpp
index 30e49d4d99feccfc651c1dd6f47624bc306037ab..29b9dae72c69073e97e886d5b7f7973c088299a5 100644 (file)
--- a/modules/gui/wince/wince.cpp
+++ b/modules/gui/wince/wince.cpp
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 

diff --git a/modules/gui/wxwidgets/dialogs.cpp b/modules/gui/wxwidgets/dialogs.cpp
index 08fc0e614798f84cba2a3a62397adeff27096657..5bd482a41a1ce5df453b97bb3f46da6a7ee74eef 100644 (file)
--- a/modules/gui/wxwidgets/dialogs.cpp
+++ b/modules/gui/wxwidgets/dialogs.cpp
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_interface.h>
 

diff --git a/modules/gui/wxwidgets/dialogs/updatevlc.hpp b/modules/gui/wxwidgets/dialogs/updatevlc.hpp
index d16dae82f92c7afa23cbc6bf78f1aaa4c26e626c..9f1d33c2c623d1d4eca7638d355119b249869d20 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/updatevlc.hpp
+++ b/modules/gui/wxwidgets/dialogs/updatevlc.hpp
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #ifdef UPDATE_CHECK
 

diff --git a/modules/gui/wxwidgets/dialogs/vlm/vlm_stream.hpp b/modules/gui/wxwidgets/dialogs/vlm/vlm_stream.hpp
index 741c0f2394c2c4d94020a70fcb704e7f91bc216c..48791d9736af2f68e307fa9b782e16fd9af01db4 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/vlm/vlm_stream.hpp
+++ b/modules/gui/wxwidgets/dialogs/vlm/vlm_stream.hpp
@@ -25,7 +25,7 @@
 #ifndef _VLM_STREAM_H_
 #define _VLM_STREAM_H_
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_vlm.h>
 

diff --git a/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.hpp b/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.hpp
index 0ce68ec91036bc0e4538f35beb5427ef4823ae75..68012bb5f28eceb2e6867825ea496e2c50f841c9 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.hpp
+++ b/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.hpp
@@ -23,7 +23,7 @@
 
 /* This is not WX-specific */
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_vlm.h>
 #include "dialogs/vlm/vlm_stream.hpp"

diff --git a/modules/gui/wxwidgets/extrapanel.cpp b/modules/gui/wxwidgets/extrapanel.cpp
index 42864b78488fed27569fc0b867c009c9a6551b0a..2f8fefcbe8f26c89857ae4c1d8d7e2e3285e6d17 100644 (file)
--- a/modules/gui/wxwidgets/extrapanel.cpp
+++ b/modules/gui/wxwidgets/extrapanel.cpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>

diff --git a/modules/gui/wxwidgets/menus.cpp b/modules/gui/wxwidgets/menus.cpp
index 62bb975f1408ed8346b367d4d837aad182d9e256..7d681b77001bda2463f89d9e5f007b578c4b8ab7 100644 (file)
--- a/modules/gui/wxwidgets/menus.cpp
+++ b/modules/gui/wxwidgets/menus.cpp
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "wxwidgets.hpp"

diff --git a/modules/gui/wxwidgets/streamdata.cpp b/modules/gui/wxwidgets/streamdata.cpp
index 6ae906fc4dd805c35717abf206fe88e301ac603c..e15218ca6b1633b98538c21b56924a085285c873 100644 (file)
--- a/modules/gui/wxwidgets/streamdata.cpp
+++ b/modules/gui/wxwidgets/streamdata.cpp
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <wx/string.h>
 #include "streamdata.h"
 

diff --git a/modules/gui/wxwidgets/video.cpp b/modules/gui/wxwidgets/video.cpp
index 7194cc40db2cc7c2e2b8eadc5c76da983b353b1f..347490865a220fcf120a6bf0ad1f67ef5df4a7a0 100644 (file)
--- a/modules/gui/wxwidgets/video.cpp
+++ b/modules/gui/wxwidgets/video.cpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>
 

diff --git a/modules/gui/wxwidgets/wxwidgets.cpp b/modules/gui/wxwidgets/wxwidgets.cpp
index 95add92fe7560c8df9a8d5a8b7ece9039ed681a3..6cad37058b364d2a48b2823d64de9b86e9ca1d6b 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.cpp
+++ b/modules/gui/wxwidgets/wxwidgets.cpp
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 

diff --git a/modules/gui/wxwidgets/wxwidgets.hpp b/modules/gui/wxwidgets/wxwidgets.hpp
index 30b254f5de3d965ab38fa71900082b7aecc7240a..bd600a731a600bb52488d728c1a244e77c32153b 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.hpp
+++ b/modules/gui/wxwidgets/wxwidgets.hpp
@@ -41,7 +41,7 @@
 /* Let vlc take care of the i18n stuff */
 #define WXINTL_NO_GETTEXT_MACRO
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include "vlc_charset.h"
 #include <vlc_playlist.h>

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 2c1eed348a5733c591a3f874df3acced40373fa7..d2fb5dbf4bed28b35fef818bde72b6ac3534e9fa 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_meta.h>

diff --git a/modules/meta_engine/id3tag.c b/modules/meta_engine/id3tag.c
index c79dcc363398f897e778952954611ee2dc83139e..45d33fc0482ee94c0f33e4ecc04698bb0c5f18b7 100644 (file)
--- a/modules/meta_engine/id3tag.c
+++ b/modules/meta_engine/id3tag.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_demux.h>

diff --git a/modules/meta_engine/musicbrainz.c b/modules/meta_engine/musicbrainz.c
index 257c2a6e0bd746b40f16f4bea3ee7d06b0848d3f..33077a4fd3a349f107b8ed5d8f92d1460bef28bd 100644 (file)
--- a/modules/meta_engine/musicbrainz.c
+++ b/modules/meta_engine/musicbrainz.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 810fd3f54082c711fef0d4f9fde606a81dff1186..49b78c25086d7697e5b6ea1b00b46832dff380cc 100644 (file)
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_meta.h>

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index 5230f20804e20dede1cc5fcf1c08c32b6e35684e..bd207737fc830750657bf072a72440c70467662b 100644 (file)
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -38,7 +38,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_meta.h>

diff --git a/modules/misc/dummy/aout.c b/modules/misc/dummy/aout.c
index 28becbf7ba4a73a5bf1d66178a71d1769b13f14b..a5b62d37b14ca377cde1e30c50a041de5a41b45f 100644 (file)
--- a/modules/misc/dummy/aout.c
+++ b/modules/misc/dummy/aout.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 
 #include "dummy.h"

diff --git a/modules/misc/dummy/decoder.c b/modules/misc/dummy/decoder.c
index 5d14596fac4a88e0ad9db7be8172dd47e85f4404..1c632d28dafe31b994b203780701f3ccf9249b23 100644 (file)
--- a/modules/misc/dummy/decoder.c
+++ b/modules/misc/dummy/decoder.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_codec.h>
 
 #ifdef HAVE_UNISTD_H

diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index 330a4044fafd6881bf0b8abb0b31e2896d903e50..c49e7ee0ae62c619d8b58822086af53c86638edd 100644 (file)
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include "dummy.h"

diff --git a/modules/misc/dummy/encoder.c b/modules/misc/dummy/encoder.c
index f387f10c07bf6ba0aaf14456feec14a63d60233f..ed8fee0c78d36e00dab59e69c2a9c1ffeec2f935 100644 (file)
--- a/modules/misc/dummy/encoder.c
+++ b/modules/misc/dummy/encoder.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_codec.h>
 #include "dummy.h"
 

diff --git a/modules/misc/dummy/input.c b/modules/misc/dummy/input.c
index 34ac44f8ffedb3e890963524ff578c5dfd8150bb..81e24b072292196442862b3d89e9bb6fdfd1f78e 100644 (file)
--- a/modules/misc/dummy/input.c
+++ b/modules/misc/dummy/input.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_access.h>
 #include <vlc_demux.h>

diff --git a/modules/misc/dummy/interface.c b/modules/misc/dummy/interface.c
index 05685c7a49db4affcba231cc23befbb2f4b5550c..3843dd8a286d2c01418042a15ca421b0ba5ae8a1 100644 (file)
--- a/modules/misc/dummy/interface.c
+++ b/modules/misc/dummy/interface.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #include "dummy.h"

diff --git a/modules/misc/dummy/renderer.c b/modules/misc/dummy/renderer.c
index afea1fd7255770caf8b437506238ec1253003110..a9d727382283af42f0a134c96238fc9695c7474b 100644 (file)
--- a/modules/misc/dummy/renderer.c
+++ b/modules/misc/dummy/renderer.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>

diff --git a/modules/misc/dummy/vout.c b/modules/misc/dummy/vout.c
index f5699088627b0b104e6ba652abae60e87f5a899a..78147b15d8e26661f50dd8c228236c1f9c3d9105 100644 (file)
--- a/modules/misc/dummy/vout.c
+++ b/modules/misc/dummy/vout.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 
 #define DUMMY_WIDTH 16

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 573c57d100ba88cab61a5ee90f2d484ef7a4a678..1f5850c4d67599b85e74b7b015d5913196fc47ce 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 465a13e0d5d6153cd8cec7fce1de53e0d59002e1..622807bdfd7e7d640359497dff78b67a7a9a7ff6 100644 (file)
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <errno.h>
 #include <time.h>

diff --git a/modules/misc/gtk_main.c b/modules/misc/gtk_main.c
index 5c40fb88ec8b6179c9922c955536ef6a51cb69bd..15282f4570ba21801d692cb51dad5cdc7f5a1535 100644 (file)
--- a/modules/misc/gtk_main.c
+++ b/modules/misc/gtk_main.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 

diff --git a/modules/misc/inhibit.c b/modules/misc/inhibit.c
index 49406c438d6e11f67ee5c8f578a0e909860cc2b4..b2c590fd471a9b4b3fd56e9000984d8f822cca03 100644 (file)
--- a/modules/misc/inhibit.c
+++ b/modules/misc/inhibit.c
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index d454a074fdcd61f6497b26686a4c9776401c2a82..36a320d07712f29cd5fced6a9bd55d9113d36280 100644 (file)
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>

diff --git a/modules/misc/lua/acl.c b/modules/misc/lua/acl.c
index 5c5209b2f2fa8e9f37606653fa056abcdf28081a..065c64c6354d4b73c75a5733f2f6dae86d889058 100644 (file)
--- a/modules/misc/lua/acl.c
+++ b/modules/misc/lua/acl.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_acl.h>
 
 #include <lua.h>        /* Low level lua C API */

diff --git a/modules/misc/lua/callbacks.c b/modules/misc/lua/callbacks.c
index 9742d83216eba7844c9a4cda53b3a9aab9b5663c..0a9b6cf490c97ee68b8839d1c3e04843b97b2293 100644 (file)
--- a/modules/misc/lua/callbacks.c
+++ b/modules/misc/lua/callbacks.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <lua.h>        /* Low level lua C API */
 #include <lauxlib.h>    /* Higher level C API */

diff --git a/modules/misc/lua/configuration.c b/modules/misc/lua/configuration.c
index 7336780e2b2aa2774b34c9fc6084b487d7f46ac6..24b1eac4b632692b2a463023ea03df8079ebf10e 100644 (file)
--- a/modules/misc/lua/configuration.c
+++ b/modules/misc/lua/configuration.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <lua.h>        /* Low level lua C API */
 #include <lauxlib.h>    /* Higher level C API */

diff --git a/modules/misc/lua/httpd.c b/modules/misc/lua/httpd.c
index 656ba525d421af34f47a53a126febcdc6357f8ce..5538b799b1036b642e45bb46295ab2aa7eb0d23e 100644 (file)
--- a/modules/misc/lua/httpd.c
+++ b/modules/misc/lua/httpd.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_httpd.h>
 
 #include <lua.h>        /* Low level lua C API */

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index 2a62c4be395036fa22fa2ca93a51c73c8adcc3e7..7cf9be53db039167144846c285f200b560384189 100644 (file)
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_meta.h>
 #include <vlc_charset.h>
 

diff --git a/modules/misc/lua/meta.c b/modules/misc/lua/meta.c
index 5ce72f39ea61162b2460f460b0729c5af048f84e..def7c5e37bc866b3f5ff39766f902b6dc0652283 100644 (file)
--- a/modules/misc/lua/meta.c
+++ b/modules/misc/lua/meta.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 #include <vlc_meta.h>

diff --git a/modules/misc/lua/net.c b/modules/misc/lua/net.c
index 70827e7402d062320a53313fb003307c535f1ec9..73a4c4b646b324933eb568fb95a5ee94f1e7dbf3 100644 (file)
--- a/modules/misc/lua/net.c
+++ b/modules/misc/lua/net.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_network.h>
 #include <vlc_url.h>
 

diff --git a/modules/misc/lua/objects.c b/modules/misc/lua/objects.c
index badf23c6be4f5041dd080315af93b0f25f155b28..fca5b0d45c3e24ade16a92dd2686e48bdaa72e45 100644 (file)
--- a/modules/misc/lua/objects.c
+++ b/modules/misc/lua/objects.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <lua.h>        /* Low level lua C API */
 #include <lauxlib.h>    /* Higher level C API */

diff --git a/modules/misc/lua/playlist.c b/modules/misc/lua/playlist.c
index 62abfdc728f7b4f46518c84fb41d5c7862a7ecc9..b24457a133b72a2e25a61abda85266bdc90f91df 100644 (file)
--- a/modules/misc/lua/playlist.c
+++ b/modules/misc/lua/playlist.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 #include <vlc_url.h>
 #include <vlc_strings.h>

diff --git a/modules/misc/lua/sd.c b/modules/misc/lua/sd.c
index 8a98b202612908e42a3934cdd433072c0449e94c..eb159d07ea1e943df0996d22e591d79a60e32f29 100644 (file)
--- a/modules/misc/lua/sd.c
+++ b/modules/misc/lua/sd.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_services_discovery.h>
 #include <vlc_playlist.h>
 

diff --git a/modules/misc/lua/variables.c b/modules/misc/lua/variables.c
index 7c6c45838d4bb16b5d40b326be8abd4e81ac7393..723ca80c8b577d3c681b82140cff3134f299cb7f 100644 (file)
--- a/modules/misc/lua/variables.c
+++ b/modules/misc/lua/variables.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <lua.h>        /* Low level lua C API */
 #include <lauxlib.h>    /* Higher level C API */

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index 75adb224461c8937c2b953748bf425ead3526fc0..077e1ff5017dc4df49fccec3d72c876f5c1e0e3a 100644 (file)
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
 #include <vlc_charset.h>

diff --git a/modules/misc/lua/vlc.h b/modules/misc/lua/vlc.h
index 50891e799ef20f0bfc31689dc465782b9cc610e4..037e309b3490928f14fd6d16860fb23fc00fb3b0 100644 (file)
--- a/modules/misc/lua/vlc.h
+++ b/modules/misc/lua/vlc.h
@@ -28,7 +28,7 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 #include <vlc_meta.h>

diff --git a/modules/misc/lua/vlm.c b/modules/misc/lua/vlm.c
index 3369e4a66349bb79589f4031caa6af071b61544c..d64f07957ef173308f7bc7559c3c0af56adec5ff 100644 (file)
--- a/modules/misc/lua/vlm.c
+++ b/modules/misc/lua/vlm.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vlm.h>
 
 #include <lua.h>        /* Low level lua C API */

diff --git a/modules/misc/memcpy/memcpy.c b/modules/misc/memcpy/memcpy.c
index 854925e2341e433b17ec3bd0033fa66ca6b6625d..90790220be4f773c9a67b4c09e10d6c9e35b3d2c 100644 (file)
--- a/modules/misc/memcpy/memcpy.c
+++ b/modules/misc/memcpy/memcpy.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #undef HAVE_MMX

diff --git a/modules/misc/memcpy/memcpyaltivec.c b/modules/misc/memcpy/memcpyaltivec.c
index 244d32ceb2c407f539adc39d742f28519b5eb433..d1c7fb5404dd52e38914d4f283846900c2248ec8 100644 (file)
--- a/modules/misc/memcpy/memcpyaltivec.c
+++ b/modules/misc/memcpy/memcpyaltivec.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #ifdef HAVE_ALTIVEC_H

diff --git a/modules/misc/notify/growl.m b/modules/misc/notify/growl.m
index a7e8c785591b1be27d1f4848d9d6a437e1f26b3b..80764c99eda680ddf3dbe3e5a22c9d8277e0e672 100644 (file)
--- a/modules/misc/notify/growl.m
+++ b/modules/misc/notify/growl.m
@@ -53,7 +53,7 @@
 #import <Foundation/Foundation.h>
 #import <Growl/GrowlDefines.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_meta.h>

diff --git a/modules/misc/notify/growl_udp.c b/modules/misc/notify/growl_udp.c
index 066eff55408b9216a3f0f3615ccb7523a08cb1f2..62b25641a3ceb0f335fd464003caae2db47fb33e 100644 (file)
--- a/modules/misc/notify/growl_udp.c
+++ b/modules/misc/notify/growl_udp.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>

diff --git a/modules/misc/notify/msn.c b/modules/misc/notify/msn.c
index b133eba6b0a758e06da392e689b9f8b611a59c54..5b23e54cf6a49f42fcc94c84fae173399df5a40d 100644 (file)
--- a/modules/misc/notify/msn.c
+++ b/modules/misc/notify/msn.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_meta.h>

diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index 1874fb03377409b0890285dfeef4f6999424483c..9e2d1a5c55d8a0894a34e896557307c175cbc203 100644 (file)
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>

diff --git a/modules/misc/notify/telepathy.c b/modules/misc/notify/telepathy.c
index 3206ede8f49511106f726184eebfe313d2273b9e..45edea36b165ed03b4441e11e676dfa902638e03 100644 (file)
--- a/modules/misc/notify/telepathy.c
+++ b/modules/misc/notify/telepathy.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_meta.h>

diff --git a/modules/misc/notify/xosd.c b/modules/misc/notify/xosd.c
index ee31cc592becd2758dd3c150784e99b04989d022..bf9994d176d96e72e88df7ee492a45d5dec64d3a 100644 (file)
--- a/modules/misc/notify/xosd.c
+++ b/modules/misc/notify/xosd.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_input.h>

diff --git a/modules/misc/osd/osd_menu.c b/modules/misc/osd/osd_menu.c
index 12616075e29f7cdd910f9099bc610eb154516831..a370703deb433bb7bd902c876e149f66881b352f 100644 (file)
--- a/modules/misc/osd/osd_menu.c
+++ b/modules/misc/osd/osd_menu.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_config.h>
 

diff --git a/modules/misc/osd/parser.c b/modules/misc/osd/parser.c
index 2818a2e74f33e1c60c9ff9708484f202aa2c57f4..39918d8e9f4a7717d7562912a843739c4a76b443 100644 (file)
--- a/modules/misc/osd/parser.c
+++ b/modules/misc/osd/parser.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_config.h>

diff --git a/modules/misc/osd/simple.c b/modules/misc/osd/simple.c
index 059d4f00f5606858bcd7f45330c000235dcd29f2..41e795f65cfde1a9d97b10820035e1714ebf8394 100644 (file)
--- a/modules/misc/osd/simple.c
+++ b/modules/misc/osd/simple.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_config.h>
 

diff --git a/modules/misc/osd/xml.c b/modules/misc/osd/xml.c
index 412b1577884a48f858594e12f425346ca151e097..0b24500e2a5c65b0a79ac595e00ccdea1928dae1 100644 (file)
--- a/modules/misc/osd/xml.c
+++ b/modules/misc/osd/xml.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_config.h>
 

diff --git a/modules/misc/playlist/export.c b/modules/misc/playlist/export.c
index e553d85f9c885b717cf7dd65db7ea34b66ed8979..498e6a9dbdd235ff642fec8c06533e59f98fef15 100644 (file)
--- a/modules/misc/playlist/export.c
+++ b/modules/misc/playlist/export.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 /***************************************************************************

diff --git a/modules/misc/playlist/m3u.c b/modules/misc/playlist/m3u.c
index 05b6b210c98dfcc7c2bf70e55746694cfe11347c..4cc4a1d405631a70a4cb121e90635c2e2e2fc40a 100644 (file)
--- a/modules/misc/playlist/m3u.c
+++ b/modules/misc/playlist/m3u.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_input.h>

diff --git a/modules/misc/playlist/old.c b/modules/misc/playlist/old.c
index a8334035fc3ca5a3f4b446e12687e46957f2809a..6de9648a6038c00a8824cb7bafac475272915c63 100644 (file)
--- a/modules/misc/playlist/old.c
+++ b/modules/misc/playlist/old.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_input.h>

diff --git a/modules/misc/playlist/xspf.c b/modules/misc/playlist/xspf.c
index d854de27a471524d27c22d683f41d230b9249205..1552abb8f4a5ce8834e0642e1676379a1d0aba1f 100644 (file)
--- a/modules/misc/playlist/xspf.c
+++ b/modules/misc/playlist/xspf.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_input.h>

diff --git a/modules/misc/probe/hal.c b/modules/misc/probe/hal.c
index 266808c09ef9839ac6cde8bee32e01c81c6f0646..b131b73c660ae6fead5b8347c7366b834c61e774 100644 (file)
--- a/modules/misc/probe/hal.c
+++ b/modules/misc/probe/hal.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_devices.h>

diff --git a/modules/misc/profile_parser.c b/modules/misc/profile_parser.c
index 5040d3534e5d70e069e049b3694ddb81a0462e0a..0b602c4ccf4641c1ca80156e61736e7c0a87db02 100644 (file)
--- a/modules/misc/profile_parser.c
+++ b/modules/misc/profile_parser.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_stream.h>
 #include <vlc_streaming.h>

diff --git a/modules/misc/qte_main.cpp b/modules/misc/qte_main.cpp
index 91c18473fefb5658db6d23bde31c122cf917f134..ea9510523145445c0e3351b88397faab982ffa4d 100644 (file)
--- a/modules/misc/qte_main.cpp
+++ b/modules/misc/qte_main.cpp
@@ -30,7 +30,7 @@ extern "C"
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 }
 

diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c
index c9eb69870e659904c4abc82b6fe4a70728e7a4c5..ae299ca157e501336fa8a4c7bd52554ca776145d 100644 (file)
--- a/modules/misc/quartztext.c
+++ b/modules/misc/quartztext.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index a2a72fcaa0abbb08f75faa8f9d98b9677a18a44e..a97551dd4ee9f1d65c33c983976fa242708a3239 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_sout.h>

diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 5b994764f225aeb21a9e8fd1977243e3ea23f49a..2d2bf7812e910f2d7e8e603cb8ac99d8ffa8ae80 100644 (file)
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>

diff --git a/modules/misc/svg.c b/modules/misc/svg.c
index d278bee82567cd4778afc12db674631cfe9970e5..9d024a614a2dc8a1053704ee78820b11a41324d9 100644 (file)
--- a/modules/misc/svg.c
+++ b/modules/misc/svg.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_charset.h>
 #include <vlc_vout.h>

diff --git a/modules/misc/testsuite/test1.c b/modules/misc/testsuite/test1.c
index 0bd146331a99553f212073731586f05f17c930be..6c54cfae3ef28a69e8d7567929d52275ae75bcf1 100644 (file)
--- a/modules/misc/testsuite/test1.c
+++ b/modules/misc/testsuite/test1.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 /*****************************************************************************

diff --git a/modules/misc/testsuite/test2.cpp b/modules/misc/testsuite/test2.cpp
index 68dc999495e213211363141bfbf76930049df9dd..63fb6ae0f7ad99422b90a6ea25891c5ee1fe0cc7 100644 (file)
--- a/modules/misc/testsuite/test2.cpp
+++ b/modules/misc/testsuite/test2.cpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <string>

diff --git a/modules/misc/testsuite/test3.m b/modules/misc/testsuite/test3.m
index 65c2fa026c2de742c2ad93a675f3b1b12686f193..b593b66cde39283e226e2e13479bef8462cf752e 100644 (file)
--- a/modules/misc/testsuite/test3.m
+++ b/modules/misc/testsuite/test3.m
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <objc/Object.h>

diff --git a/modules/misc/testsuite/test4.c b/modules/misc/testsuite/test4.c
index e7e7aad23588fb1fc2874e8f411aa35b887591cf..931a98ac4bc640b1a613f88de900091928b6bc77 100644 (file)
--- a/modules/misc/testsuite/test4.c
+++ b/modules/misc/testsuite/test4.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <signal.h>

diff --git a/modules/misc/win32text.c b/modules/misc/win32text.c
index 43539d0d9ca84cc02a1e38868bf3ea469ee05e1f..98a7d878bd125d04206dcec6ef9ed6e56d99276b 100644 (file)
--- a/modules/misc/win32text.c
+++ b/modules/misc/win32text.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>

diff --git a/modules/misc/xml/libxml.c b/modules/misc/xml/libxml.c
index 1169656c9305972432f7bea1abf779d5217c269c..c098f6824e1cc2ff0e3a2b16b1977af2172aa446 100644 (file)
--- a/modules/misc/xml/libxml.c
+++ b/modules/misc/xml/libxml.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include "vlc_block.h"

diff --git a/modules/misc/xml/xtag.c b/modules/misc/xml/xtag.c
index ef33b2a05156c7098791e54cd14cd5c658eecda6..e3b5193cbaccf77290a866a461aac03293dc28d5 100644 (file)
--- a/modules/misc/xml/xtag.c
+++ b/modules/misc/xml/xtag.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include "vlc_xml.h"

diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index d6fac277041f31e1d200d3d8fb2b4292126aeeaa..dad3aeebd4246a1df085d8b14c4753abcca9bf15 100644 (file)
--- a/modules/mux/asf.c
+++ b/modules/mux/asf.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/mux/avi.c b/modules/mux/avi.c
index fdd6b66025a33fcf63ae1a295775911339285140..31b13153abf0d89a86d350d5c886caca84aea4e8 100644 (file)
--- a/modules/mux/avi.c
+++ b/modules/mux/avi.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/mux/dummy.c b/modules/mux/dummy.c
index 4d2032a2b6829e74d6c6bb99748defbbe40484e3..a62b3587e8a44620813696c61d81b81a1c0b8fec 100644 (file)
--- a/modules/mux/dummy.c
+++ b/modules/mux/dummy.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 0babc2b0764999a0e4cac5613b5b32728769c548..eb50dbfc055e22258da432c1058b3be46714af68 100644 (file)
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/mux/mpeg/csa.c b/modules/mux/mpeg/csa.c
index 54545bf048297230c7f460d1389c7f7a804d4b0f..5840f6eec1c9a49aed48376d7df5ee187802bed8 100644 (file)
--- a/modules/mux/mpeg/csa.c
+++ b/modules/mux/mpeg/csa.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "csa.h"
 

diff --git a/modules/mux/mpeg/pes.c b/modules/mux/mpeg/pes.c
index 2c8c38d8dc690bb46472d2feb28862e7118903fb..9f77b6a52b4ebe0000449349a5d54be03516bc23 100644 (file)
--- a/modules/mux/mpeg/pes.c
+++ b/modules/mux/mpeg/pes.c
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
 

diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c
index c3879bd2aaa4e74e2411d9cd7f245b086473f702..6459c07d4dc48e7f87b4d3a02c3a938718d027b5 100644 (file)
--- a/modules/mux/mpeg/ps.c
+++ b/modules/mux/mpeg/ps.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_codecs.h>

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index fa1c67bc611764157549103e7e785b57861a9f50..f06a0cbe5ebf18fc650099ab625817c12adef8b7 100644 (file)
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_codecs.h>

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index a63d488216dc40a3132253e5097d8d0ca6deac5d..98b2fad6df3925ae6ec9460cda8fcf91aaa97c72 100644 (file)
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index 7f70af058ff14dd855f2516e73320f15a2580b42..95bda99d98a98bff7e7373e1b162bae1363dd540 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/mux/rtp/rtcp.c b/modules/mux/rtp/rtcp.c
index 3161b0c2d8634bb98bc381b5e8ab1d143a7ec676..c6ef545003d34fa369e1ada32ea124f74065e5c2 100644 (file)
--- a/modules/mux/rtp/rtcp.c
+++ b/modules/mux/rtp/rtcp.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_bits.h>
 #include <vlc_block.h>
 

diff --git a/modules/mux/wav.c b/modules/mux/wav.c
index 6501e554e4d07a42b8d55eaf41f7686ef8bf7969..ed522b684ea6caa84b4dd31e5357980ac23c474d 100644 (file)
--- a/modules/mux/wav.c
+++ b/modules/mux/wav.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_sout.h>

diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c
index 9d12af8114354dd23375b7deaa964257f3abc1ee..e62ce1bdd250eba1a4f165cb16694d27002d9068 100644 (file)
--- a/modules/packetizer/copy.c
+++ b/modules/packetizer/copy.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_block.h>

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index 5beee6cec803baaa60e17d04e34c9fb2aa8fa7ef..79f5f53e5410fc300e2650f64ec3aba5c8e7dac3 100644 (file)
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_codec.h>

diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index ecf5a66608a5a1dc8b022d19a6e0931f38c7aaf5..2202bbfa6cf370dac5d989ca73a20a30bbd8d3c8 100644 (file)
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>

diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c
index 37c55bcf11e05b41b978410dd517ef404e1138c8..95c72e6e2549dabea690ee94daf25291b06573ea 100644 (file)
--- a/modules/packetizer/mpeg4video.c
+++ b/modules/packetizer/mpeg4video.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_codec.h>

diff --git a/modules/packetizer/mpegvideo.c b/modules/packetizer/mpegvideo.c
index c9b49b83516efe4eaaaa1603c34c50e5eed32d4d..3ff42ad96a8099e4badb407c1cf6cc32618ad031 100644 (file)
--- a/modules/packetizer/mpegvideo.c
+++ b/modules/packetizer/mpegvideo.c
@@ -46,7 +46,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_block.h>
 #include <vlc_codec.h>

diff --git a/modules/packetizer/vc1.c b/modules/packetizer/vc1.c
index ef03298378942798bf10dc218dc8207dce2c2930..854b93691d3086db3600c8079aa674e6b2ad5672 100644 (file)
--- a/modules/packetizer/vc1.c
+++ b/modules/packetizer/vc1.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_block.h>

diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c
index aa1e5ccf68621284dda585ff9bbe415cc6284323..e6d06fcbbc9b0701198098e2d4ff513292d2d39f 100644 (file)
--- a/modules/services_discovery/bonjour.c
+++ b/modules/services_discovery/bonjour.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_arrays.h>

diff --git a/modules/services_discovery/hal.c b/modules/services_discovery/hal.c
index 27f0a3136dc58869d98d4773fea240cff2405180..74611421087b59cc9e249bf7406c83edd2bdbc4e 100644 (file)
--- a/modules/services_discovery/hal.c
+++ b/modules/services_discovery/hal.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index 6fb111b6144ddc474a251581ea1434ce78cf8542..63993e904b091262ddb7687604b7fa6096a725b8 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_network.h>

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 09214d1a2e9ee4889eeea403161fe5c22ae9dae6..a666469609e6962a1c0e380c8a587a48c2f0b750 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <assert.h>
 

diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c
index b2528ae2d1fc6fe64a2c2890fd44a84026b03fc1..fe68fd9612490ead61ddb4f8be5a7273c61263d5 100644 (file)
--- a/modules/services_discovery/shout.c
+++ b/modules/services_discovery/shout.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_services_discovery.h>
 

diff --git a/modules/services_discovery/upnp_cc.cpp b/modules/services_discovery/upnp_cc.cpp
index 55ec72158fe492dc8fc4e0a122d3f0bb80aa928b..b4d1757ddb3ed563b488f3106432191d93e153d4 100644 (file)
--- a/modules/services_discovery/upnp_cc.cpp
+++ b/modules/services_discovery/upnp_cc.cpp
@@ -36,7 +36,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 

diff --git a/modules/services_discovery/upnp_intel.cpp b/modules/services_discovery/upnp_intel.cpp
index c602756ed917995903d7012ba437eebe05a5a19a..b8db719b8b44874c440e19d64dac1b3f85fc711d 100644 (file)
--- a/modules/services_discovery/upnp_intel.cpp
+++ b/modules/services_discovery/upnp_intel.cpp
@@ -42,7 +42,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 

diff --git a/modules/stream_out/autodel.c b/modules/stream_out/autodel.c
index f120992fe75250eba1c75011ece8f996d3f1fb34..9cc8c4b719b65d702c17b7075cccb6ac0f8e4d7f 100644 (file)
--- a/modules/stream_out/autodel.c
+++ b/modules/stream_out/autodel.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c
index e2dac1e7634b00c039c74121c35f1db2c054a5f6..1e0a7ada2dbcf3df5df1146e719b785e4a68d6f1 100644 (file)
--- a/modules/stream_out/bridge.c
+++ b/modules/stream_out/bridge.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/stream_out/description.c b/modules/stream_out/description.c
index 935734708a59ff8923968724cd9b9533010a19f9..e38b71780daa4fc3ef01290d7cac07eec482a69a 100644 (file)
--- a/modules/stream_out/description.c
+++ b/modules/stream_out/description.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_block.h>

diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c
index 48d13b5520f99523cdcfae2c7777b6ae7ba82245..d9dc33a3b2eecc61f1d3e95f4017d5b18dde5ac6 100644 (file)
--- a/modules/stream_out/display.c
+++ b/modules/stream_out/display.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_sout.h>

diff --git a/modules/stream_out/dummy.c b/modules/stream_out/dummy.c
index 91c279c6d5cb47d6ed1ede4a42bba6f36b3d0179..a1e457430ec26599c9c57b1fdf65c97c4ccf38f3 100644 (file)
--- a/modules/stream_out/dummy.c
+++ b/modules/stream_out/dummy.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_block.h>
 #include <vlc_sout.h>

diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c
index 54de5d7fb12a67331e07c8eb24a85034d7a6e3d1..2510be0f39294e7000e43b7cc5c9ec8c52c96bc6 100644 (file)
--- a/modules/stream_out/duplicate.c
+++ b/modules/stream_out/duplicate.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c
index a8d1568d6bd6932d897248ccc6672f8292a44cbc..059bd51209ccebcac73a40d9975eb3e13046be37 100644 (file)
--- a/modules/stream_out/es.c
+++ b/modules/stream_out/es.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_sout.h>

diff --git a/modules/stream_out/gather.c b/modules/stream_out/gather.c
index c95f9e737cb1d5899b3e3260e52ae3ee63349bcf..e14eb44d44562e547bc797000abfb51539ff2ead 100644 (file)
--- a/modules/stream_out/gather.c
+++ b/modules/stream_out/gather.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_sout.h>

diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index 871b190a51b7e9d4b70b70a62d778998cec4244a..d40fe7195c58e42c8f5980a36ad2367c26245f68 100644 (file)
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/stream_out/rtcp.c b/modules/stream_out/rtcp.c
index 8458f77f4c9e505cc2315fb3e3b291043befb3b3..438f3d976ab988ed664bf866ea333536496a5ed0 100644 (file)
--- a/modules/stream_out/rtcp.c
+++ b/modules/stream_out/rtcp.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_block.h>
 
 #include <vlc_network.h>

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 6a16374dc3c51e5180ccd075636d817d5af2e915..430be664f7e3c562e64bbc535e17d7da7a128a58 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>

diff --git a/modules/stream_out/rtpfmt.c b/modules/stream_out/rtpfmt.c
index 7da262a1c6f906f55286ef3ad75c22e540d2d48a..bcd8ec6058f6966a0479da2609f099ef840647d7 100644 (file)
--- a/modules/stream_out/rtpfmt.c
+++ b/modules/stream_out/rtpfmt.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
 

diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c
index 0db208c68fc9561f1b4e0985fc924b3a6cf980db..412ef7ca39b53bfdb43ec570f5756840f603a2cb 100644 (file)
--- a/modules/stream_out/rtsp.c
+++ b/modules/stream_out/rtsp.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_sout.h>
 
 #include <vlc_httpd.h>

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 6b97d20af2ce44b739b38b2c01d5965075cc599b..09fa0448e72ddb0dc804075d13754adb3204227d 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -32,7 +32,7 @@
 # define _WIN32_WINNT 0x0501
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 

diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c
index f27ba1dba47583c82cf1772928b7d072030a44af..a28c4096addd54c647c3861cab68a86850e8ea4a 100644 (file)
--- a/modules/stream_out/switcher.c
+++ b/modules/stream_out/switcher.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index ad9c6ea19d65f58ad48d2d4c0f45869f9a6fa898..afebc8c54c7a041869d9c672f3b2c90892e7393a 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_sout.h>

diff --git a/modules/stream_out/transrate/block.c b/modules/stream_out/transrate/block.c
index 386677b1cdb43515d2f198c5a9164a785c88f864..67e6332caab2e32f3ca95d3244d56611bda2afbe 100644 (file)
--- a/modules/stream_out/transrate/block.c
+++ b/modules/stream_out/transrate/block.c
@@ -39,7 +39,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_sout.h>
 #include <vlc_codec.h>
 

diff --git a/modules/stream_out/transrate/frame.c b/modules/stream_out/transrate/frame.c
index 544459816c7eae0a4594dc5b3bf7dda8aecebdb1..5d7a02e3ffdc8380cea90fcacbabe818a213c823 100644 (file)
--- a/modules/stream_out/transrate/frame.c
+++ b/modules/stream_out/transrate/frame.c
@@ -39,7 +39,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_sout.h>
 #include <vlc_codec.h>
 

diff --git a/modules/stream_out/transrate/transrate.c b/modules/stream_out/transrate/transrate.c
index 5833999c8b533ab03ec90c0683735359a94063ef..98ce0836b7952dce346e9acd60a416febb8948fb 100644 (file)
--- a/modules/stream_out/transrate/transrate.c
+++ b/modules/stream_out/transrate/transrate.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_input.h>

diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c
index 8f0388aa13339af644db2dd4a9c2ac8309be788b..7ffdd30a597987ba6577eb684438f06d07850a44 100644 (file)
--- a/modules/video_chroma/chain.c
+++ b/modules/video_chroma/chain.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_chroma/grey_yuv.c b/modules/video_chroma/grey_yuv.c
index 95a3b6754a6d0f0875824f457ccb58d448eb9443..f9447b213a90575ef151a00f3bb8b1afd091def3 100644 (file)
--- a/modules/video_chroma/grey_yuv.c
+++ b/modules/video_chroma/grey_yuv.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index 1427a99e338a25a3b0e43a55bac0cca3bcb7d5ab..d4bff48d419cc95313f451d5ee0ef2e90a754467 100644 (file)
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_chroma/i420_rgb16.c b/modules/video_chroma/i420_rgb16.c
index 50da750ad1c5290dbf2e8c35c6f579bde196d207..eb28475830d50e17b5800895ced5f6122b563cd4 100644 (file)
--- a/modules/video_chroma/i420_rgb16.c
+++ b/modules/video_chroma/i420_rgb16.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 
 #include "i420_rgb.h"

diff --git a/modules/video_chroma/i420_rgb8.c b/modules/video_chroma/i420_rgb8.c
index d18c855528d5709a474a1243a697a3f918b76a5e..4388e80f18833320b836af57d856f2f2d685d9d2 100644 (file)
--- a/modules/video_chroma/i420_rgb8.c
+++ b/modules/video_chroma/i420_rgb8.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 
 #include "i420_rgb.h"

diff --git a/modules/video_chroma/i420_ymga.c b/modules/video_chroma/i420_ymga.c
index 3a823656ebe55fa40d5c86f405ae03fd85ead2a0..c41f404f067ee75480ec084f561376061b4492e6 100644 (file)
--- a/modules/video_chroma/i420_ymga.c
+++ b/modules/video_chroma/i420_ymga.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index 578830ceca75185be25133721e33d33c78bc19e3..70a6c96593c5430477b3ef20f2c2262a76227410 100644 (file)
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_chroma/i422_i420.c b/modules/video_chroma/i422_i420.c
index 708de31d64efcbfb5f8bb32c79a0c59737fbe1bf..0271207cb360d404133435f3601ace673a428c29 100644 (file)
--- a/modules/video_chroma/i422_i420.c
+++ b/modules/video_chroma/i422_i420.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c
index f7a73686ecfa1143472c0f54f22ed475f791f828..9da832ae010e29b8add3efa4ce3ef10514061520 100644 (file)
--- a/modules/video_chroma/i422_yuy2.c
+++ b/modules/video_chroma/i422_yuy2.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_chroma/yuy2_i420.c b/modules/video_chroma/yuy2_i420.c
index 8e51e2f5dc91a3846a58503e1b9be23697eb9ad1..1406197b8224f66aa7a0d2b350d7e337213ad733 100644 (file)
--- a/modules/video_chroma/yuy2_i420.c
+++ b/modules/video_chroma/yuy2_i420.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_chroma/yuy2_i422.c b/modules/video_chroma/yuy2_i422.c
index 88e362cfe4577d9ceace032d49e51a27a29637b6..a4e00ce92574893c85bf2414126aa82c3d8e2dbb 100644 (file)
--- a/modules/video_chroma/yuy2_i422.c
+++ b/modules/video_chroma/yuy2_i422.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c
index 8492fb6fb3c0e6dbdbe4633c276957b5db02ca81..a15dbcaae36b7853078077c1c706acacf2bec541 100644 (file)
--- a/modules/video_filter/adjust.c
+++ b/modules/video_filter/adjust.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>

diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index 28d42a8c35da9deb91374fda315ecd503f2eb740..e3edea223fc4359f1a4ccd1c6c9f9a4a38b42572 100644 (file)
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/atmo/AtmoDefs.h b/modules/video_filter/atmo/AtmoDefs.h
index 9f9c6de9f9e71954fef173128f6acf76c7dbdfb3..4a8a8928515edee6288a430096390a0e3dae8b39 100644 (file)
--- a/modules/video_filter/atmo/AtmoDefs.h
+++ b/modules/video_filter/atmo/AtmoDefs.h
@@ -16,7 +16,7 @@
 #   define __STDC_CONSTANT_MACROS 1
 #   include <inttypes.h>
 
-#   include <vlc/vlc.h>
+#   include <vlc_common.h>
 
 /* some things need to be changed if this code is used inside VideoLan Filter Module */
 #   define _ATMO_VLC_PLUGIN_

diff --git a/modules/video_filter/atmo/AtmoDynData.h b/modules/video_filter/atmo/AtmoDynData.h
index 6e07198e94e10860bb9dfefe7808986109a9431b..d03d4dc9b3bc02fa3bae48923c794d9596f3d2e5 100644 (file)
--- a/modules/video_filter/atmo/AtmoDynData.h
+++ b/modules/video_filter/atmo/AtmoDynData.h
@@ -18,7 +18,7 @@
 #if !defined(_ATMO_VLC_PLUGIN_)
 #    include "AtmoDisplays.h"
 #else
-#    include <vlc/vlc.h>
+#    include <vlc_common.h>
 #    include <vlc_threads.h>
 #endif
 

diff --git a/modules/video_filter/atmo/AtmoLiveView.cpp b/modules/video_filter/atmo/AtmoLiveView.cpp
index 5db300b6878ae4ba7a499fe8a37b65fca1c17c66..db1a42e5e54e18a5e4093f35b5ac7ac537bfb119 100644 (file)
--- a/modules/video_filter/atmo/AtmoLiveView.cpp
+++ b/modules/video_filter/atmo/AtmoLiveView.cpp
@@ -13,7 +13,7 @@
 #include "AtmoTools.h"
 
 #if defined(_ATMO_VLC_PLUGIN_)
-# include <vlc/vlc.h>
+# include <vlc_common.h>
 #else
 #  include "AtmoGdiDisplayCaptureInput.h"
 #endif

diff --git a/modules/video_filter/atmo/AtmoThread.h b/modules/video_filter/atmo/AtmoThread.h
index 46190f76959d244b7f994d357e3dd83d1d42ed86..a129e9f1c3799ed27bd783f3eb89503039bb7d54 100644 (file)
--- a/modules/video_filter/atmo/AtmoThread.h
+++ b/modules/video_filter/atmo/AtmoThread.h
@@ -13,7 +13,7 @@
 
 #if defined(_ATMO_VLC_PLUGIN_)
 // use threading stuff from videolan!
-#   include <vlc/vlc.h>
+#   include <vlc_common.h>
 #   include <vlc_threads.h>
 
     typedef struct

diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index 80f04bb08deb6a6b67b9d303d130030ed358e7c4..38a6696849eac462f4a64720017bcdaf2acb640c 100644 (file)
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -34,7 +34,7 @@
 
 // #define __ATMO_DEBUG__
 // [:Zs]+$
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/blend.c b/modules/video_filter/blend.c
index 58028526a07132cb152def036bf0f2cc50cbc114..5c29fecccdd55f5694f9e08250afba3e9da57b1d 100644 (file)
--- a/modules/video_filter/blend.c
+++ b/modules/video_filter/blend.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include "vlc_filter.h"

diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c
index dab13aba8b43f5ab676ade201b75400f2c622b7d..08e350fc85f0318f10f79103186dc5aeec5c28a6 100644 (file)
--- a/modules/video_filter/blendbench.c
+++ b/modules/video_filter/blendbench.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>

diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c
index 80a50649bc52c80f243d320602d943e196375f24..97ad84f9da5d32cc02aaf0bed8260856b58c16e5 100644 (file)
--- a/modules/video_filter/bluescreen.c
+++ b/modules/video_filter/bluescreen.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c
index fefc8f83945ee7f3b305564057cdc8aea62bf899..9343f731dd8d845f3870a8525c4d6834c995db03 100644 (file)
--- a/modules/video_filter/clone.c
+++ b/modules/video_filter/clone.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index 07c32799e87f055a4ecd5e2190cf1f9e16c22d7f..0d0d89080f2d63eaefda711c9f3b9ca118570e3f 100644 (file)
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>

diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c
index a23036ec2ba7adf84bc715571c654ce481693ced..689e7c22bac571fc5c1e5f67ad1d850c7569a274 100644 (file)
--- a/modules/video_filter/crop.c
+++ b/modules/video_filter/crop.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>

diff --git a/modules/video_filter/croppadd.c b/modules/video_filter/croppadd.c
index 00acc55689280ea79124a23fba059a2f80b12148..3bf236ed835ad9683c06a1166e2912b475fa0555 100644 (file)
--- a/modules/video_filter/croppadd.c
+++ b/modules/video_filter/croppadd.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include "vlc_filter.h"

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index e65a7dfce378949a4747c830cb0ee1ec4ecd3fea..6eecac31e18d4d4a57a5aa6aafa143898c6329a9 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -34,7 +34,7 @@
 #   include <altivec.h>
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_sout.h>

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
index bf279dc88cb55c7384131cbb8f408a57c39ab163..da4d799cecf4c55b13044fb4e05d593b071ea1dc 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.h b/modules/video_filter/dynamicoverlay/dynamicoverlay.h
index 532d39f54ce64b246b218010bb87c84d72b4b3ad..8eb500a527a32bfc0c9de63395e930f00c63e41c 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay.h
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.h
@@ -24,7 +24,7 @@
 #ifndef DYNAMIC_OVERLAY_H
 #define DYNAMIC_OVERLAY_H   1
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_filter.h>
 
 /*****************************************************************************

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c
index ee0e2db4774d73832ad705c71d4a15654abc1ff5..e24518ad4a1fa349b8c256d2c2d9aad6c0b99fc8 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_osd.h>
 #include <vlc_filter.h>
 

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
index c4cb9975b5e4637bbf5ddfbe0b3d06496b5c342d..bb0b381a814abfe10e4adf5ae750b7072c803fcb 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_arrays.h>
 #include <vlc_vout.h>
 #include <vlc_filter.h>

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
index 5a29b4d4fd53bd92d027623c2a12a582712402da..e3c5acc43c9f25e501367144533e07f9233ef833 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_osd.h>
 
 #include <fcntl.h>

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c
index 9fd757ad01d34f07d840d806ac59c3ad4f7f7d53..80d8b301313f88dd2203f690365497e8fa1fbeef 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_osd.h>
 
 #include "dynamicoverlay.h"

diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c
index 23e29291ef5a161e64f77f282d306d9abb6e632a..370c68d3ef8c44eb47eb91ebed11f700b3edfa5f 100644 (file)
--- a/modules/video_filter/erase.c
+++ b/modules/video_filter/erase.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>

diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c
index 441807bf6ea1a6da74165ad9dc2c7e9c7d929e37..0aae4f3f1d933a80aeeffe51ce753bec364de8bc 100644 (file)
--- a/modules/video_filter/extract.c
+++ b/modules/video_filter/extract.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c
index 0a8341134c1e49be6af479dada72618c0b0171a2..8a6536d6b748d4d7eca23c16e7a1b32b05e532f5 100644 (file)
--- a/modules/video_filter/gaussianblur.c
+++ b/modules/video_filter/gaussianblur.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c
index 3d70a4ac273dc84269f5d71f883501e153ec7266..8a32c3934b64185ccfb694bf5ca8d09ed61b3d53 100644 (file)
--- a/modules/video_filter/gradient.c
+++ b/modules/video_filter/gradient.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>

diff --git a/modules/video_filter/grain.c b/modules/video_filter/grain.c
index ad01a25eff75625e91a517e0b32cefac71635ba1..64654dee448b6dacf60d8225c58c9ffb10421b0c 100644 (file)
--- a/modules/video_filter/grain.c
+++ b/modules/video_filter/grain.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c
index 5eb9325506964aacb0d1219133a2dfaee1b5d810..39b7e707df6ced1582fca049214ddccf19251c38 100644 (file)
--- a/modules/video_filter/invert.c
+++ b/modules/video_filter/invert.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 68c11bece8d53eb8d6764e7b0624802631d8bac3..20f7386bc54f2c23f999c33496012e1105a455df 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/magnify.c b/modules/video_filter/magnify.c
index 2a07201b5411c379d285eb1b7ac4e5b6d9c418b6..7a77573c3e5b4a3357a1b616c94eeda6db382015 100644 (file)
--- a/modules/video_filter/magnify.c
+++ b/modules/video_filter/magnify.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index a4c12b493d16fbd6ee405287e89c6a8fa743b531..28a54e01963ce22a945f8c52af455a413d0374bc 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 667a16c1e0981418c2c194e3ffcde66cf0071474..f912baca21872e9db3fdf4856d2f28185da0b060 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c
index 441c378851439fc80b0822a59a88125771117908..971f8f01f68c91e5c12bcc9a59e286ff8489a402 100644 (file)
--- a/modules/video_filter/motionblur.c
+++ b/modules/video_filter/motionblur.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>

diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index 025c2e19f4d84fb637e5b24e4f63e1219bf86e64..592e1b93245b6aa58e4c190241c695aa2abcb5b4 100644 (file)
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>

diff --git a/modules/video_filter/noise.c b/modules/video_filter/noise.c
index 49740c465eee4b85e4c9bf0349fd492e0d1097ce..06fb31ac05a15892e5cef7f3397b386e8215819a 100644 (file)
--- a/modules/video_filter/noise.c
+++ b/modules/video_filter/noise.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index 54a3f4d31a52763aaca3fd82ddd640a245826f28..91f9c6bfd51b9563e76c1af58976fc1ba8f440d3 100644 (file)
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include "filter_common.h"

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index dfa964e16f055384d8b4843968b401872cd8478d..1095f6cf06a0b5adcf12bd7e6f8c81c0e763b897 100644 (file)
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index a99a797b20b8502994187950ca9e58b90b74e691..31d49c9fdab528c9735b9368a4d246944ee9e822 100644 (file)
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_filter.h>

diff --git a/modules/video_filter/panoramix.c b/modules/video_filter/panoramix.c
index fcb3594ab109233e8be62a204ef74a6a23663329..1ac44f69cd6569163ef948aec4efa50eea41e757 100644 (file)
--- a/modules/video_filter/panoramix.c
+++ b/modules/video_filter/panoramix.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c
index 5482359aacd0a06a2c7a84176e3c091e3c22dc80..374c3e29d2aa507d60e2b612217ff8f0963e42d4 100644 (file)
--- a/modules/video_filter/psychedelic.c
+++ b/modules/video_filter/psychedelic.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include "vlc_filter.h"

diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c
index 200e89e99d364d01854fc2387d756f9d1d83aa1a..d9f07e31acb9fa3e723c21d37a963a1652970c82 100644 (file)
--- a/modules/video_filter/puzzle.c
+++ b/modules/video_filter/puzzle.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c
index f5c7f60865251adc5466af5d9cccad3f990953ac..e3880561d88ccb5a17043d96ff065162c9ab3955 100644 (file)
--- a/modules/video_filter/ripple.c
+++ b/modules/video_filter/ripple.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_filter.h>

diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c
index 0d6ba5c1e85b83f2a59013c38aa1b7bf8b4954ff..fb8f0acc2f369fa908eff378846803c8dc1a6536 100644 (file)
--- a/modules/video_filter/rotate.c
+++ b/modules/video_filter/rotate.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 768720422dc898f858ee3479f4402cbf2ecd1c5f..09c8e8319733d0b67c4a2b8910590b818e8153ac 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/rv32.c b/modules/video_filter/rv32.c
index dd1b6c44d55c53d8982892e4ab5954d0dee5e6d3..6b406ca0ac11fb34f4de01b083c2bf0f30eb4ee5 100644 (file)
--- a/modules/video_filter/rv32.c
+++ b/modules/video_filter/rv32.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include "vlc_filter.h"

diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c
index 5e9d2f05e5b7ad8949458be3cb55519ca44a3d69..b27aa2434b300c14de5d6e42e751695d89ca5910 100644 (file)
--- a/modules/video_filter/scale.c
+++ b/modules/video_filter/scale.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include "vlc_filter.h"

diff --git a/modules/video_filter/seamcarving.c b/modules/video_filter/seamcarving.c
index 66d0c32e2f8c98daad0c7de9ac5360af1b3ccab6..a22294ed661d98154b3b1457896477907863958f 100644 (file)
--- a/modules/video_filter/seamcarving.c
+++ b/modules/video_filter/seamcarving.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>

diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c
index 8447e2b5d7b6818698ab39608cd2d834e343ca70..2aa3b3470c865e1b556704dae3b57249911304b2 100644 (file)
--- a/modules/video_filter/sharpen.c
+++ b/modules/video_filter/sharpen.c
@@ -37,7 +37,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c
index 3eb2b58eac3bb7f7e28a286233e5a5d386f6b4ec..3b2266ca5c77d9badd37fd4777bcb5f6a1e4d48b 100644 (file)
--- a/modules/video_filter/transform.c
+++ b/modules/video_filter/transform.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c
index 09f3cda7a4199458e6bb28437eddbb71f42bc0c0..9327b9cb4b4a160c1fc8128e0cf4a1b1a56b47be 100644 (file)
--- a/modules/video_filter/wall.c
+++ b/modules/video_filter/wall.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c
index 882b7e2a5cd6034e135c1e383c56c5203d105fca..64f3b1581181582a55c0b5fee8731a9447ad4be7 100644 (file)
--- a/modules/video_filter/wave.c
+++ b/modules/video_filter/wave.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index 92e663c76c8310ed6b1d6d0162afeabe14706461..9710b593d3a3d198185b28f251c1182517ad2c2e 100644 (file)
--- a/modules/video_output/aa.c
+++ b/modules/video_output/aa.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 967dea8e68c0d9af94a6dee4247927186247715a..41292b4b47ce9b62ba403056ce8ebcf4fcb3accf 100644 (file)
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>

diff --git a/modules/video_output/directfb.c b/modules/video_output/directfb.c
index 3b82eaf901657b0a31a5fde35d125451d9503491..17876afe5fb9ff5a01742094e8cae83eabaf8bb0 100644 (file)
--- a/modules/video_output/directfb.c
+++ b/modules/video_output/directfb.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <directfb.h>

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 91b28ba0d10b212eb8fc3922be545845fbce9108..9fba636c6d0f2e6f1df305f819783b603811050c 100644 (file)
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -42,7 +42,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_output/ggi.c b/modules/video_output/ggi.c
index 804e03a01a39ad5f617e40e3e5a865c04ae154d3..b3ae57485402f227ed67e8304c615bc1559de1db 100644 (file)
--- a/modules/video_output/ggi.c
+++ b/modules/video_output/ggi.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>

diff --git a/modules/video_output/glide.c b/modules/video_output/glide.c
index 2c8c425f30f9735ed8e10803248939ffd3618e5d..6cc87d21782c5d2b3236d392fd4ee0d84349bb7d 100644 (file)
--- a/modules/video_output/glide.c
+++ b/modules/video_output/glide.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>

diff --git a/modules/video_output/hd1000v.cpp b/modules/video_output/hd1000v.cpp
index 34a0213e66573b551208b92f6409faf2720ebd03..e5cbf29df0671c8dba2650435e6449c1f3831705 100644 (file)
--- a/modules/video_output/hd1000v.cpp
+++ b/modules/video_output/hd1000v.cpp
@@ -31,7 +31,7 @@ extern "C" {
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_playlist.h>

diff --git a/modules/video_output/image.c b/modules/video_output/image.c
index 164fb1c6d0300d5a17488b8cead033e380ebe033..05f8891039b72843d578bed12cfb3b8c82ec5af3 100644 (file)
--- a/modules/video_output/image.c
+++ b/modules/video_output/image.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>

diff --git a/modules/video_output/mga.c b/modules/video_output/mga.c
index a9f53d9cdcc2fb0a97cf789c200fafb1a4db1f5a..9cfbad461d08bd5f4e447cb1c2953ebd391e8b1a 100644 (file)
--- a/modules/video_output/mga.c
+++ b/modules/video_output/mga.c
@@ -35,7 +35,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 19c8efc133c4a03bfd5c4f000f910279db567d56..829882062ca161623ccf415736f57e370c503600 100644 (file)
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -39,7 +39,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>

diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index afc6be2fec444e3030f2ec2582b5c1cc6d13dc1d..56aade1f8be2968483240de30caabe42c8b1ffb9 100644 (file)
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -40,7 +40,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index f37d9520be4b8db5b30c7375b7d23fdae58356d4..7987ab283f6499b5a8b3714066f1f5e68c267493 100644 (file)
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -37,7 +37,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_vout.h>

diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index b4db014b22ebe3c8c10881d01560db109bb64aef..6cd20ceb0f5fc943342a56390a0b1b145ce99307 100644 (file)
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>

diff --git a/modules/video_output/msw/wingdi.c b/modules/video_output/msw/wingdi.c
index abf4cf95272cb9f82e4ee06f044d93263f7bbfa6..aa4d499fae93db2cff490f545dc15e5f2b2dc1fa 100755 (executable)
--- a/modules/video_output/msw/wingdi.c
+++ b/modules/video_output/msw/wingdi.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 74a5b3b1549d58aa9a5b2df04d570026df2d733b..deab0f79fca2b7bc727b748f8fe1a49c1a6e7e77 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_output/opengllayer.m b/modules/video_output/opengllayer.m
index 27128c051178151047eafc542fdaf174d814bac9..c6d8d2e3c135517af033a03ad9d1280ebd090938 100644 (file)
--- a/modules/video_output/opengllayer.m
+++ b/modules/video_output/opengllayer.m
@@ -36,7 +36,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_output/qte/qte.cpp b/modules/video_output/qte/qte.cpp
index da41e4a4798977c57bfe25d02e88be6cc944bb76..11316fbdfb312aada33b7eb29230bd33d98cde68 100644 (file)
--- a/modules/video_output/qte/qte.cpp
+++ b/modules/video_output/qte/qte.cpp
@@ -42,7 +42,7 @@ extern "C"
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>

diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index be76ba744003c87c0294b1df7e2404ede812538e..08bc5d6d92cd95c5a488749f00a1f9bbaa953e58 100644 (file)
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>

diff --git a/modules/video_output/snapshot.c b/modules/video_output/snapshot.c
index bc6f97ca834ae381f49fb3b8e5d3d6ccfdcb08c3..fb0b9cf7ce124ac4c7a73e687e5502b619bc54c2 100644 (file)
--- a/modules/video_output/snapshot.c
+++ b/modules/video_output/snapshot.c
@@ -43,7 +43,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>

diff --git a/modules/video_output/svgalib.c b/modules/video_output/svgalib.c
index 3b5dd0475e2baaba4487892e4a5c4fd7da53f124..0563758344657347ef2041ab5ecdf1878acc0746 100644 (file)
--- a/modules/video_output/svgalib.c
+++ b/modules/video_output/svgalib.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index f699bf81452b2aed18128b6832a78a1004c6910f..3e169cf1d1a37c5bb3d7aa60324794387e2feafb 100644 (file)
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 

diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index 3b986eed0fc3ee3d2a15a1672869d203b4fb031d..9339e6ff0e2160cbef2fe841894b61ce4451926a 100644 (file)
--- a/modules/video_output/x11/glx.c
+++ b/modules/video_output/x11/glx.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>

diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
index a8832b5ef10835c9a6190ee615c5bcae7b1da708..9da6f1038a5ca4bfbae223f90953267fac70ce82 100644 (file)
--- a/modules/video_output/x11/x11.c
+++ b/modules/video_output/x11/x11.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 /*****************************************************************************

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index deb9569e3ba6196c8c132740a2a91c35eaeb0e86..bf8c56527125c6bae569b3c8bc77bb4cabec3c18 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_vout.h>

diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c
index 6710a18475719e2b2ffe56e9de5fca46f18ffbad..787a9df4ed5f935f19a26f6f3e4e264531e96210 100644 (file)
--- a/modules/video_output/x11/xvideo.c
+++ b/modules/video_output/x11/xvideo.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 /*****************************************************************************

diff --git a/modules/video_output/x11/xvmc.c b/modules/video_output/x11/xvmc.c
index 56dc044d115ea60e9d012e8b1fd886e1de249281..5b1dad408b583687ded50b733cbf6ec889b3384f 100644 (file)
--- a/modules/video_output/x11/xvmc.c
+++ b/modules/video_output/x11/xvmc.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>

diff --git a/modules/visualization/galaktos/init_cond.c b/modules/visualization/galaktos/init_cond.c
index 059bbbc34737c83289c3b3d64bb9d72942767f48..1162d4013fdcf9bbe3af05b775b998777fb5cc34 100644 (file)
--- a/modules/visualization/galaktos/init_cond.c
+++ b/modules/visualization/galaktos/init_cond.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 /* Library functions to manipulate initial condition values */
 

diff --git a/modules/visualization/galaktos/plugin.h b/modules/visualization/galaktos/plugin.h
index 449dd97fb1e3e18d1be27185fc6ea166fad7d1eb..980d34e03e01a135a7180fb10e4cf3e7a902b075 100644 (file)
--- a/modules/visualization/galaktos/plugin.h
+++ b/modules/visualization/galaktos/plugin.h
@@ -28,7 +28,7 @@
  #include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
 

diff --git a/modules/visualization/galaktos/preset.c b/modules/visualization/galaktos/preset.c
index f040804d5889d71875972a5d05f212a49538b014..cbb1046da27022fcbdc4133436ec17c4c235d3c5 100644 (file)
--- a/modules/visualization/galaktos/preset.c
+++ b/modules/visualization/galaktos/preset.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_charset.h>
 
 #include <stdlib.h>

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 8d768fe605c12ecda6e9a59d1085af698f14475b..b8190251a27eec89e1230f63b40430a1e8573be9 100644 (file)
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>

diff --git a/modules/visualization/visual/effects.c b/modules/visualization/visual/effects.c
index 0aef6bb92195c948662f3ca157364e3274a85949..cdacdb568d6856792c6fdf454952f9e95e986b53 100644 (file)
--- a/modules/visualization/visual/effects.c
+++ b/modules/visualization/visual/effects.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_aout.h>
 

diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
index b768cbda5ba4d75dc3eb470352db8badbaeb4b3b..836925ee343c1dc760e50619f7398edc97f3a84b 100644 (file)
--- a/modules/visualization/visual/visual.c
+++ b/modules/visualization/visual/visual.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_aout.h>