diff --git a/Makefile b/Makefile
index e6498ff8c..1af43d4f0 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ endif
 
 # standard includes
 KPDFREADER_CFLAGS=$(CFLAGS) -I$(LUADIR)/src -I$(MUPDFDIR)/
-K2PDFOPT_CFLAGS=-I$(MUPDFDIR)/ -I$(DJVUDIR)/ -I$(K2PDFOPTLIBDIR)/
+K2PDFOPT_CFLAGS=-I$(K2PDFOPTLIBDIR)/willuslib -I$(K2PDFOPTLIBDIR)/k2pdfoptlib -I$(K2PDFOPTLIBDIR)/
 
 # enable tracing output:
 
diff --git a/koptcontext.h b/koptcontext.h
index d788f897e..67bf24844 100644
--- a/koptcontext.h
+++ b/koptcontext.h
@@ -21,7 +21,7 @@
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
-#include "k2pdfopt.h"
+#include "koptreflow.h"
 
 int luaopen_koptcontext(lua_State *L);
 #endif
diff --git a/libk2pdfopt b/libk2pdfopt
index 9f405ca38..38fba22a7 160000
--- a/libk2pdfopt
+++ b/libk2pdfopt
@@ -1 +1 @@
-Subproject commit 9f405ca3823e637d83db1a8e6c4989bf5e188ff3
+Subproject commit 38fba22a7bbc4d20f04d7d0df18f9431a8115c54