diff --git a/c/flisp.c b/c/flisp.c
index 53242f1..784262f 100644
--- a/c/flisp.c
+++ b/c/flisp.c
@@ -127,9 +127,9 @@ static value_t apply_cl(uint32_t nargs);
 static value_t *alloc_words(int n);
 static value_t relocate(value_t v);
 
-static fl_readstate_t *readstate = NULL;
+static struct fl_readstate *readstate = NULL;
 
-static void free_readstate(fl_readstate_t *rs)
+static void free_readstate(struct fl_readstate *rs)
 {
     htable_free(&rs->backrefs);
     htable_free(&rs->gensyms);
@@ -557,7 +557,7 @@ void gc(int mustgrow)
     static int grew = 0;
     void *temp;
     uint32_t i, f, top;
-    fl_readstate_t *rs;
+    struct fl_readstate *rs;
 
     curheap = tospace;
     if (grew)
diff --git a/c/flisp.h b/c/flisp.h
index 36ccad8..1e0f266 100644
--- a/c/flisp.h
+++ b/c/flisp.h
@@ -162,19 +162,19 @@ fixnum_t tofixnum(value_t v, char *fname);
 char *tostring(value_t v, char *fname);
 
 /* error handling */
-typedef struct _fl_readstate_t {
+struct fl_readstate {
     struct htable backrefs;
     struct htable gensyms;
     value_t source;
-    struct _fl_readstate_t *prev;
-} fl_readstate_t;
+    struct fl_readstate *prev;
+};
 
 typedef struct _ectx_t {
     jmp_buf buf;
     uint32_t sp;
     uint32_t frame;
     uint32_t ngchnd;
-    fl_readstate_t *rdst;
+    struct fl_readstate *rdst;
     struct _ectx_t *prev;
 } fl_exception_context_t;
 
diff --git a/c/read.h b/c/read.h
index f1c22b1..9d8ef61 100644
--- a/c/read.h
+++ b/c/read.h
@@ -678,7 +678,7 @@ static value_t do_read_sexpr(value_t label)
 value_t fl_read_sexpr(value_t f)
 {
     value_t v;
-    fl_readstate_t state;
+    struct fl_readstate state;
     state.prev = readstate;
     htable_new(&state.backrefs, 8);
     htable_new(&state.gensyms, 8);