diff --git a/ChangeLog b/ChangeLog
index dbe66f79d..8455b5f60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-07  Robert Larice
+ * src/frontend/vectors.c ,
+ * src/frontend/parser/complete.c ,
+ * src/include/ngspice/cpextern.h ,
+ * src/include/ngspice/ftedefs.h ,
+ * src/include/ngspice/plot.h :
+   use type `struct ccom'
+
 2012-02-07  Robert Larice
  * src/main.c ,
  * src/frontend/outitf.c ,
diff --git a/src/frontend/parser/complete.c b/src/frontend/parser/complete.c
index 5f71d9398..849754279 100644
--- a/src/frontend/parser/complete.c
+++ b/src/frontend/parser/complete.c
@@ -374,9 +374,9 @@ cctowl(struct ccom *cc, bool sib)
 /* We use this in com_device... */
 
 wordlist *
-cp_cctowl(char *stuff)
+cp_cctowl(struct ccom *stuff)
 {
-    return (cctowl((struct ccom *) stuff, TRUE));
+    return (cctowl(stuff, TRUE));
 }
 
 /* Turn on and off the escape break character and cooked mode. */
@@ -553,18 +553,18 @@ cp_remkword(int kw_class, char *word)
  * that position, and the keyword class given is set to the argument.
  */
 
-char *
-cp_kwswitch(int kw_class, char *tree)
+struct ccom *
+cp_kwswitch(int kw_class, struct ccom *tree)
 {
-    char *old;
+    struct ccom *old;
 
     if ((kw_class < 1) || (kw_class >= NCLASSES)) {
         fprintf(cp_err, "cp_addkword: Internal Error: bad class %d\n",
                 kw_class);
         return (NULL);
     }
-    old = (char *) keywords[kw_class];
-    keywords[kw_class] = (struct ccom *) tree;
+    old = keywords[kw_class];
+    keywords[kw_class] = tree;
     return (old);
 }
 
diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c
index 352a11053..f4751d1a6 100644
--- a/src/frontend/vectors.c
+++ b/src/frontend/vectors.c
@@ -691,6 +691,7 @@ plot_alloc(char *name)
 {
     struct plot *pl = alloc(struct plot), *tp;
     char *s;
+    struct ccom *ccom;
     char buf[BSIZE_SP];
 
     ZERO(pl, struct plot);
@@ -707,9 +708,9 @@ plot_alloc(char *name)
     pl->pl_typename = copy(buf);
     cp_addkword(CT_PLOT, buf);
     /* va: create a new, empty keyword tree for class CT_VECTOR, s=old tree */
-    s = cp_kwswitch(CT_VECTOR, NULL);
+    ccom = cp_kwswitch(CT_VECTOR, NULL);
     cp_addkword(CT_VECTOR, "all");
-    pl->pl_ccom = cp_kwswitch(CT_VECTOR, s);
+    pl->pl_ccom = cp_kwswitch(CT_VECTOR, ccom);
     /* va: keyword tree is old tree again, new tree is linked to pl->pl_ccom */
     return (pl);
 }
diff --git a/src/include/ngspice/cpextern.h b/src/include/ngspice/cpextern.h
index ba609494d..fddbac5cd 100644
--- a/src/include/ngspice/cpextern.h
+++ b/src/include/ngspice/cpextern.h
@@ -14,6 +14,7 @@ Modified: 2000  AlansFixes
 #include "ngspice/wordlist.h"
 #include "ngspice/bool.h"
 
+struct ccom;
 
 /* com_alias.c */
 
@@ -33,7 +34,7 @@ extern wordlist *cp_bquote(wordlist *wlist);
 
 extern bool cp_nocc;
 extern bool cp_comlook(char *word);
-extern char *cp_kwswitch(int kw_class, char *tree);
+extern struct ccom *cp_kwswitch(int kw_class, struct ccom *tree);
 extern void cp_addcomm(char *word, long int bits0, long int bits1, long int bits2, long int bits3);
 extern void cp_addkword(int kw_class, char *word);
 extern void cp_ccom(wordlist *wlist, char *buf, bool esc);
@@ -41,7 +42,7 @@ extern void cp_ccon(bool on);
 extern void cp_ccrestart(bool kwords);
 extern void cp_remcomm(char *word);
 extern void cp_remkword(int kw_class, char *word);
-extern wordlist *cp_cctowl(char *stuff);
+extern wordlist *cp_cctowl(struct ccom *stuff);
 
 /* cshpar.c */
 
diff --git a/src/include/ngspice/ftedefs.h b/src/include/ngspice/ftedefs.h
index 968a7cbe4..e0c2cf489 100644
--- a/src/include/ngspice/ftedefs.h
+++ b/src/include/ngspice/ftedefs.h
@@ -17,6 +17,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include "ngspice/fteinp.h"
 #include "ngspice/fteoptdefs.h"
 
+struct ccom;
+
 struct save_info {
     char	*name;
     IFuid	analysis;
@@ -39,8 +41,8 @@ struct circ {
     bool ci_runonce;    /* So com_run can to a reset if necessary... */
     wordlist *ci_commands;  /* Things to do when this circuit is done. */
     struct circ *ci_next;   /* The next in the list. */
-    char *ci_nodes;     /* ccom structs for the nodes... */
-    char *ci_devices;   /* and devices in the circuit. */
+    struct ccom *ci_nodes;     /* ccom structs for the nodes... */
+    struct ccom *ci_devices;   /* and devices in the circuit. */
     char *ci_filename;  /* Where this circuit came from. */
     TSKtask *ci_defTask;   /* the default task for this circuit */
     TSKtask *ci_specTask;  /* the special task for command line jobs */
diff --git a/src/include/ngspice/plot.h b/src/include/ngspice/plot.h
index 3a40aa55f..12810abdc 100644
--- a/src/include/ngspice/plot.h
+++ b/src/include/ngspice/plot.h
@@ -5,6 +5,8 @@
 #include "ngspice/bool.h"
 #include "ngspice/dvec.h"
 
+struct ccom;
+
 /* The information for a particular set of vectors that come from one
  * plot.  */
 struct plot {
@@ -17,7 +19,7 @@ struct plot {
     struct plot *pl_next;	/* List of plots. */
     wordlist *pl_commands;	/* Commands to execute for this plot. */
     struct variable *pl_env;	/* The 'environment' for this plot. */
-    char *pl_ccom;		/* The ccom struct for this plot. */
+    struct ccom *pl_ccom;	/* The ccom struct for this plot. */
     bool pl_written;		/* Some or all of the vecs have been saved. */
     int pl_ndims;		/* Number of dimensions */
 } ;