--- bindings/java/src/playlist-jni.cc	2007-02-13 16:19:34.000000000 +0000
+++ bindings/java/src/playlist-jni.cc.new	2007-02-13 16:25:39.000000000 +0000
@@ -34,6 +34,12 @@
 
 #include "utils.h"
 
+#include <windows.h>
+#ifdef usleep
+	#undef usleep
+#endif
+#define usleep(x) Sleep(1000 * (x))
+
 
 JNIEXPORT jint JNICALL Java_org_videolan_jvlc_Playlist__1playlist_1add (JNIEnv *env, jobject _this, jstring uri, jstring name,  jobjectArray options) {
 
--- bindings/java/Makefile	2007-02-14 16:07:53.000000000 +0000
+++ bindings/java/Makefile.new	2007-02-14 15:56:14.000000000 +0000
@@ -341,6 +341,7 @@
 EXTRA_DIST = FAQ TODO README THANKS javadoc.xml VlcClient.java \
 	VLCExample.java org/videolan/jvlc/AudioIntf.java \
 	org/videolan/jvlc/Audio.java \
+	org/videolan/jvlc/VLMIntf.java org/videolan/jvlc/VLM.java \
 	org/videolan/jvlc/GenericVideoWidget.java \
 	org/videolan/jvlc/InputIntf.java org/videolan/jvlc/Input.java \
 	org/videolan/jvlc/JLibVLC.java \
@@ -349,9 +350,9 @@
 	org/videolan/jvlc/PlaylistIntf.java \
 	org/videolan/jvlc/Playlist.java \
 	org/videolan/jvlc/VideoIntf.java org/videolan/jvlc/Video.java \
-	org/videolan/jvlc/VLCException.java \
-	org/videolan/jvlc/VLMIntf.java org/videolan/jvlc/VLM.java
-OBJECTS = org/videolan/jvlc/VLCException.class org/videolan/jvlc/Playlist.class org/videolan/jvlc/AudioIntf.class org/videolan/jvlc/Audio.class org/videolan/jvlc/InputIntf.class org/videolan/jvlc/Input.class org/videolan/jvlc/PlaylistIntf.class org/videolan/jvlc/VideoIntf.class org/videolan/jvlc/Video.class org/videolan/jvlc/JLibVLC.class org/videolan/jvlc/JVLC.class org/videolan/jvlc/JVLCCanvas.class org/videolan/jvlc/JVLCPanel.class org/videolan/jvlc/VLMIntf.class org/videolan/jvlc/VLM.class  org/videolan/jvlc/GenericVideoWidget.class
+	org/videolan/jvlc/VLCException.java
+
+OBJECTS = org/videolan/jvlc/VLCException.class org/videolan/jvlc/VLMIntf.class org/videolan/jvlc/VLM.class org/videolan/jvlc/Playlist.class org/videolan/jvlc/AudioIntf.class org/videolan/jvlc/Audio.class org/videolan/jvlc/InputIntf.class org/videolan/jvlc/Input.class org/videolan/jvlc/PlaylistIntf.class org/videolan/jvlc/VideoIntf.class org/videolan/jvlc/Video.class org/videolan/jvlc/JLibVLC.class org/videolan/jvlc/JVLC.class org/videolan/jvlc/JVLCCanvas.class org/videolan/jvlc/JVLCPanel.class org/videolan/jvlc/GenericVideoWidget.class
 COBJECTS = src/utils.o src/video-jni.o src/audio-jni.o src/input-jni.o src/playlist-jni.o src/vlm-jni.o src/core-jni.o src/graphics-jni.o
 
 # Include some JAVA stuff
@@ -366,7 +367,7 @@
 JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
 #JAVALDFLAGS = -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic`
 JAVALDFLAGS = -mno-cygwin -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic` -Wl,--kill-at
-all: all-recursive
+all: libjvlc.so all-recursive
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -682,7 +683,15 @@
 # Build targets
 all: libjvlc.so VlcClient VLCExample
 
+INC_DIR=includes
+
 libjvlc.so: $(OBJECTS)
+	if [ ! -d $(INC_DIR) ]; then \
+		mkdir $(INC_DIR); \
+	fi
+	for i in `ls *.h`; do \
+		mv $$i $(INC_DIR)/`echo $$i | cut -d "_" -f 4`; \
+	done
 	$(MAKE) -C src
 	$(CXX) -shared $(COBJECTS) $(LIBJINCLUDES) $(LDFLAGS) $(JAVALDFLAGS) -o jvlc.dll
 #libjvlc.so: $(OBJECTS)