#include <errno.h>
 
 #include "glite/lb/events_parse.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 #include "glite/wmsutils/jobid/cjobid.h"
 
 static void free_events(edg_wll_Event *);
 
 #include <unistd.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/authz.h"
 
 void
 
 #include <stddef.h>
 #include <string.h>
 
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 #include "glite/lb/context-int.h"
-#include "glite/lb/consumer_fake.h"
+#include "consumer_fake.h"
 
 
 #define NUM_EVENTS 3
 
 #include <fcntl.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 
 extern char *optarg;
 
 #include <errno.h>
 #include <sysexits.h>
 
-#include "glite/lb/notification.h"
+#include "notification.h"
 
 static void usage(const char *);
 static void printstat(edg_wll_JobStat, int);
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/wmsutils/jobid/cjobid.h"
 
 static void slave();
 
 #include <errno.h>
 
 #include "glite/lb/events_parse.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 #include "glite/wmsutils/jobid/cjobid.h"
 #ifdef USE_CALLBACKS
   #include "glite/lb/consumer_fake.h"
 
 #include <fcntl.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 
 extern char *optarg;
 
 #include <expat.h>
 
 #include "glite/lb/context-int.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 #include "glite/lb/xml_conversions.h"
 
 static void dgerr(edg_wll_Context,char *);
 
 
 #include "glite/security/glite_gss.h"
 #include "glite/lb/context.h"
-#include "glite/lb/notification.h"
+#include "notification.h"
 
 
 static char *me;
 
 #include <errno.h>
 #include <fcntl.h>
 
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 #include "glite/lb/events_parse.h"
 
 
  * fake implementation of the producer API
  */
 
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/context-int.h"
-#include "glite/lb/producer_fake.h"
+#include "producer_fake.h"
 
 #define FAKE_VERSION 1
 
 
 #include <time.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 
 #define BUFF_LEN               1024
 #define MAX_AND_CONDS  20
 
 #include <globus_common.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 
 
 static struct option opts[] = {
 
 #include <time.h>
 #include <string.h>
 
-#include "glite/lb/statistics.h"
+#include "statistics.h"
 
 
 int main(int argc,char **argv)
 
 #include <limits.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 
 char   *outfile = "context_errors";
 
 #include <fcntl.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 
 #define        MAXMSGSIZE      10240
 
 
 #include "glite/lb/context.h"
 #include "glite/lb/xml_conversions.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 
 int use_proxy = 0;
 
 
 
 #include "glite/lb/context.h"
 #include "glite/lb/xml_conversions.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 
 int use_proxy = 0;