1 files changed, 7 insertions, 12 deletions
diff --git a/parser.h b/parser.h
index e655e34..91ee036 100644
--- a/parser.h
+++ b/parser.h
@@ -91,21 +91,16 @@ private:
 	State *done(const gchar *str);
 };
 
-#include "goto.h"
-#include "qbuffers.h"
-
 extern gint macro_pc;
 
-extern struct States {
-	StateStart	start;
-	StateLabel	label;
-	StateControl	control;
-	StateECommand	ecommand;
-	StateFile	file;
-	StateInsert	insert;
-} states;
+namespace States {
+	extern StateStart 	start;
+	extern StateControl	control;
+	extern StateECommand	ecommand;
+	extern StateInsert	insert;
 
-extern State *current_state;
+	extern State *current;
+}
 
 extern enum Mode {
 	MODE_NORMAL = 0,