8 files changed, 8 insertions, 8 deletions
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 31aa6e9d597c..b341a8f61998 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -33,7 +33,7 @@
 
 #include <tools/rtti.hxx>
 #ifndef _POOLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #endif
 #include <com/sun/star/media/ZoomLevel.hpp>
 
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index f9a52d584ea0..e7e1e0df2d1c 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -31,7 +31,7 @@
 #ifndef _AVMEDIA_MEDIATOOLBOX_HXX
 #define _AVMEDIA_MEDIATOOLBOX_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
 
 namespace avmedia
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 4d3d229826d5..2e51b0500441 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -31,7 +31,7 @@
 #ifndef _AVMEDIA_HELPIDS_HRC
 #define _AVMEDIA_HELPIDS_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define HID_AVMEDIA_TOOLBOXITEM_PLAY    (HID_AVMEDIA_START+0)
 #define HID_AVMEDIA_TOOLBOXITEM_PAUSE   (HID_AVMEDIA_START+1)
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 9ed28adc7067..e5ecac180b6c 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -37,7 +37,7 @@
 #include <tools/time.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/lstbox.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <math.h>
 #include <algorithm>
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index df1ddeb6237c..367ad725fa9a 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #include <tools/resmgr.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <vcl/svapp.hxx>
 
 namespace avmedia {
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 52c8cf61b103..6c2ea64f1fcc 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -35,7 +35,7 @@
 #include "mediacontrol.hrc"
 #include "helpids.hrc"
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/bindings.hxx>
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
index b445aa87d62e..f207713ac47a 100644
--- a/avmedia/source/java/makefile.mk
+++ b/avmedia/source/java/makefile.mk
@@ -51,7 +51,7 @@ JAVAFILES  = \
     FrameGrabber.java       \
     x11$/SystemWindowAdapter.java   
 
-JARFILES        = sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
+JARFILES        = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
 JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class)
 
 JARTARGET               = $(TARGET).jar
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 5a3376c0ce65..4cf91bd3d199 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -36,7 +36,7 @@
 #include "mediawindow.hrc"
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>