diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp
index 185e1c97..6f16fc56 100755
--- a/utils/code_model_generator/main.cpp
+++ b/utils/code_model_generator/main.cpp
@@ -276,7 +276,7 @@ void makeGetter(PIFile & f, const PICodeParser::Entity * e) {
 	piForeachC (PICodeParser::Member & m, e->members) {
 		if (m.is_type_ptr || m.isBitfield() || !m.dims.isEmpty() || (m.visibility != PICodeParser::Public))
 			continue;
-		f << "\tif (strcmp(name, \"" << m.name << "\") == 0) {ret << " << m.name << "; return ret;}\n";
+		f << "\tif (strcmp(name, \"" << m.name << "\") == 0) {ret << p->" << m.name << "; return ret;}\n";
 	}
 	f << "\treturn ret;\n}\n";
 }
@@ -405,7 +405,7 @@ void writeModel(PICodeParser & parser, PICLI & cli, const PIString out, bool met
 	f << "\n";
 	f << "#ifndef " << defname << "\n#define " << defname << "\n\n";
 	f << "#include \"pivariant.h\"\n#include \"picodeinfo.h\"";
-	if (streams || texts) {
+	if (streams || texts || getters) {
 		PIVector<PIString> incf = inc_files.toVector();
 		piForeachC (PIString & i, incf) {
 			if (i != parser.mainFile())