1 files changed, 4 insertions, 10 deletions
diff --git a/popt/poptint.h b/popt/poptint.h
index fe8430b76..089275e53 100644
--- a/popt/poptint.h
+++ b/popt/poptint.h
@@ -45,16 +45,10 @@ struct optionStackEntry {
     int next;
 /*@only@*/ /*@null@*/ const char * nextArg;
 /*@keep@*/ /*@null@*/ const char * nextCharArg;
-/*@dependent@*/ /*@null@*/ struct poptAlias * currAlias;
+/*@dependent@*/ /*@null@*/ poptItem currAlias;
     int stuffed;
 };
 
-struct execEntry {
-/*@owned@*/ /*@null@*/ const char * longName;
-    char shortName;
-/*@only@*/ /*@null@*/ const char * script;
-};
-
 struct poptContext_s {
     struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
 /*@dependent@*/ struct optionStackEntry * os;
@@ -64,15 +58,15 @@ struct poptContext_s {
 /*@keep@*/ const struct poptOption * options;
     int restLeftover;
 /*@only@*/ /*@null@*/ const char * appName;
-/*@only@*/ /*@null@*/ struct poptAlias * aliases;
+/*@only@*/ /*@null@*/ poptItem aliases;
     int numAliases;
     int flags;
-/*@owned@*/ /*@null@*/ struct execEntry * execs;
+/*@owned@*/ /*@null@*/ poptItem execs;
     int numExecs;
 /*@only@*/ /*@null@*/ const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-/*@dependent@*/ /*@null@*/ struct execEntry * doExec;
+/*@dependent@*/ /*@null@*/ poptItem doExec;
 /*@only@*/ const char * execPath;
     int execAbsolute;
 /*@only@*/ const char * otherHelp;