#ifndef CALC_SCANNER_DEF_H_
#define CALC_SCANNER_DEF_H_

typedef union {
    int int_value;
} YYSTYPE;

class ParserState {
public:
    int result;
	int eval;
    ParserState() : result(0) {
    }
};

#endif // CALC_SCANNER_DEF_H_

#ifndef CALC_SCANNER_DEF_H_
#define CALC_SCANNER_DEF_H_

typedef union {
    int int_value;
} YYSTYPE;

typedef struct {
	int function;
    int result;
	YYSTYPE lhs;
	YYSTYPE rhs;
} BinaryFunction;

class ParserState {
public:
    int result;
	int eval;
    ParserState() : result(0) {
    }
};

#endif // CALC_SCANNER_DEF_H_

--- 
+++ 
@@ -4,13 +4,6 @@
 typedef union {
     int int_value;
 } YYSTYPE;
-
-typedef struct {
-	int function;
-    int result;
-	YYSTYPE lhs;
-	YYSTYPE rhs;
-} BinaryFunction;
 
 class ParserState {
 public:
Remove silly struct that's silly
