diff --git a/src/ui.cpp b/src/ui.cpp
index 66f6b76c..e0315b9f 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -47,7 +47,7 @@ enum {
 };
 
 
-struct UiPacker__State
+struct UiPacker::State
 {
     int mode;
 
@@ -184,7 +184,7 @@ UiPacker::UiPacker(const Packer *p_) :
 
     clear_cb();
 
-    s = new UiPacker__State;
+    s = new State;
     memset(s,0,sizeof(*s));
     s->msg_buf[0] = '\r';
 
diff --git a/src/ui.h b/src/ui.h
index e4f95ed3..c79b227d 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -39,8 +39,6 @@ class UiPacker;
 //
 **************************************************************************/
 
-struct UiPacker__State;
-
 class UiPacker
 {
 public:
@@ -94,7 +92,8 @@ protected:
     upx_callback_t cb;
 
     // internal state
-    UiPacker__State *s;
+    struct State;
+    State *s;
 
     // totals
     static long total_files;