--- a/Makefile
+++ b/Makefile
@@ -12,11 +12,11 @@
 VPATH+= $(SRC_PATH_BARE)/src/vm
 SRCS+= decoder.c vm.c vmcmd.c
 
-HEADERS = src/dvd_types.h src/dvdnav.h src/dvdnav_events.h
+HEADERS = src/dvdnav/dvd_types.h src/dvdnav/dvdnav.h src/dvdnav/dvdnav_events.h
 
 CFLAGS += $(USEDEBUG) -Wall -funsigned-char
 CFLAGS += -I$(CURDIR) -I$(SRC_PATH)/src -I$(SRC_PATH)/src/vm
-CFLAGS += -DDVDNAV_COMPILE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H
 
 L=libdvdnav
@@ -57,7 +57,7 @@
 
 version.h:
 	sh $(SRC_PATH)/version.sh $(SRC_PATH) "$(SHLIB_VERSION)"
-	
+
 $(SRCS): version.h