7 files changed, 19 insertions, 9 deletions
diff --git a/source4/lib/appweb/config.mk b/source4/lib/appweb/config.mk
index 7d1eca3437..1a73d6834a 100644
--- a/source4/lib/appweb/config.mk
+++ b/source4/lib/appweb/config.mk
@@ -1,13 +1,23 @@
 #######################
+# Start SUBSYSTEM MPR
+[SUBSYSTEM::MPR]
+ADD_OBJ_FILES = \
+		lib/appweb/mpr/miniMpr.o \
+		lib/appweb/mpr/var.o
+NOPROTO=YES
+# End SUBSYSTEM MPR
+#######################
+
+
+#######################
 # Start SUBSYSTEM EJS
 [SUBSYSTEM::EJS]
 ADD_OBJ_FILES = \
 		lib/appweb/ejs/ejsLib.o  \
 		lib/appweb/ejs/ejsLex.o \
 		lib/appweb/ejs/ejsParser.o \
-		lib/appweb/ejs/ejsProcs.o \
-		lib/appweb/ejs/miniMpr.o \
-		lib/appweb/ejs/var.o
+		lib/appweb/ejs/ejsProcs.o
+REQUIRED_SUBSYSTEMS = MPR
 NOPROTO=YES
 # End SUBSYSTEM EJS
 #######################
diff --git a/source4/lib/appweb/ejs/ejs.h b/source4/lib/appweb/ejs/ejs.h
index f1d2bb4c6e..5efdb47192 100644
--- a/source4/lib/appweb/ejs/ejs.h
+++ b/source4/lib/appweb/ejs/ejs.h
@@ -44,8 +44,8 @@
 #ifndef _h_EJS
 #define _h_EJS 1
 
-#include	"miniMpr.h"
-#include	"var.h"
+#include	"lib/appweb/mpr/miniMpr.h"
+#include	"lib/appweb/mpr/var.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source4/lib/appweb/esp/esp.h b/source4/lib/appweb/esp/esp.h
index ee86e8d345..e15daf0b4e 100644
--- a/source4/lib/appweb/esp/esp.h
+++ b/source4/lib/appweb/esp/esp.h
@@ -38,8 +38,8 @@
 
 #include	"lib/appweb/ejs/ejs.h"
 #include	"lib/appweb/esp/espEnv.h"
-#include	"lib/appweb/ejs/var.h"
-#include	"lib/appweb/ejs/miniMpr.h"
+#include	"lib/appweb/mpr/var.h"
+#include	"lib/appweb/mpr/miniMpr.h"
 
 /*********************************** Defines **********************************/
 
diff --git a/source4/lib/appweb/ejs/miniMpr.c b/source4/lib/appweb/mpr/miniMpr.c
index 7dda4e7bd7..abeefe1ec8 100644
--- a/source4/lib/appweb/ejs/miniMpr.c
+++ b/source4/lib/appweb/mpr/miniMpr.c
@@ -29,7 +29,7 @@
  *	@end
  */
 
-#include	"lib/appweb/ejs/miniMpr.h"
+#include	"miniMpr.h"
 
 /************************************ Code ************************************/
 #if !BLD_APPWEB
diff --git a/source4/lib/appweb/ejs/miniMpr.h b/source4/lib/appweb/mpr/miniMpr.h
index d431ebdc1b..a0030b25b5 100644
--- a/source4/lib/appweb/ejs/miniMpr.h
+++ b/source4/lib/appweb/mpr/miniMpr.h
@@ -41,7 +41,7 @@
 
 /* allow this library to use strcpy() */
 #undef strcpy
-	#include 	"config.h"
+	#include 	"lib/appweb/ejs/config.h"
 
 #if BLD_APPWEB
 	/*
diff --git a/source4/lib/appweb/ejs/var.c b/source4/lib/appweb/mpr/var.c
index 9d2afe5306..9d2afe5306 100644
--- a/source4/lib/appweb/ejs/var.c
+++ b/source4/lib/appweb/mpr/var.c
diff --git a/source4/lib/appweb/ejs/var.h b/source4/lib/appweb/mpr/var.h
index 8ed13a4995..8ed13a4995 100644
--- a/source4/lib/appweb/ejs/var.h
+++ b/source4/lib/appweb/mpr/var.h