diff --git a/ChangeLog b/ChangeLog
index 1eb48c29b..3e344bd40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-20  Robert Larice
+ * src/xspice/cmpp/pp_mod.c ,
+ * src/xspice/cmpp/writ_ifs.c :
+   #5/7 use a subdirectory "ngspice" for includes to create a uniq namespace
+
 2011-08-20  Robert Larice
  * visualc/vngspice.vcproj :
    #4/7 use a subdirectory "ngspice" for includes to create a uniq namespace
diff --git a/src/xspice/cmpp/pp_mod.c b/src/xspice/cmpp/pp_mod.c
index 150966c08..a2d521407 100755
--- a/src/xspice/cmpp/pp_mod.c
+++ b/src/xspice/cmpp/pp_mod.c
@@ -152,7 +152,7 @@ void preprocess_mod_file (
    mod_num_errors = 0;
 
    fprintf (mod_yyout, "#line 1 \"%s\"\n", filename);
-   fprintf (mod_yyout, "#include \"cm.h\"\n");
+   fprintf (mod_yyout, "#include <ngspice/cm.h>\n");
    fprintf (mod_yyout, "extern void %s(Mif_Private_t *);\n",
       ifs_table.name.c_fcn_name);
    fprintf (mod_yyout, "#line 1 \"%s\"\n", filename);
diff --git a/src/xspice/cmpp/writ_ifs.c b/src/xspice/cmpp/writ_ifs.c
index b7df48380..24fb2588e 100755
--- a/src/xspice/cmpp/writ_ifs.c
+++ b/src/xspice/cmpp/writ_ifs.c
@@ -209,15 +209,15 @@ static void  write_includes(
     FILE *fp)                /* File to write to */
 {
     fprintf(fp, "\n");
-	fprintf(fp, "#include \"ngspice.h\"  \n");
-/*  fprintf(fp, "#include \"prefix.h\"  \n");*/
-    fprintf(fp, "#include <stdio.h>     \n");
-    fprintf(fp, "#include \"devdefs.h\" \n");
-    fprintf(fp, "#include \"ifsim.h\"   \n");
-    fprintf(fp, "#include \"mifdefs.h\" \n");
-    fprintf(fp, "#include \"mifproto.h\" \n");
-    fprintf(fp, "#include \"mifparse.h\" \n");
-/*  fprintf(fp, "#include \"suffix.h\"  \n");*/
+	fprintf(fp, "#include <ngspice/ngspice.h>\n");
+/*  fprintf(fp, "#include <ngspice/prefix.h>\n");*/
+    fprintf(fp, "#include <stdio.h>\n");
+    fprintf(fp, "#include <ngspice/devdefs.h>\n");
+    fprintf(fp, "#include <ngspice/ifsim.h>\n");
+    fprintf(fp, "#include <ngspice/mifdefs.h>\n");
+    fprintf(fp, "#include <ngspice/mifproto.h>\n");
+    fprintf(fp, "#include <ngspice/mifparse.h>\n");
+/*  fprintf(fp, "#include <ngspice/suffix.h>\n");*/
     fprintf(fp, "\n");
 }