diff --git a/src/tools/rc/Jamfile b/src/tools/rc/Jamfile
index 951b197453..e22fd0e681 100644
--- a/src/tools/rc/Jamfile
+++ b/src/tools/rc/Jamfile
@@ -4,7 +4,6 @@ USES_BE_API on <build>librdef.a <build>rc = true ;
 
 GENERATE_C++ on [ FGristFiles lexer.l parser.y ] = true ;
 
-SubDirSysHdrs [ FDirName $(HAIKU_TOP) headers os app ] ;
 SubDirC++Flags -Wno-sign-compare -Wno-unused ;
 
 local r5Compatibility = [ FDirName $(SUBDIR) R5Compatibility.h ] ;
diff --git a/src/tools/rc/lexer.l b/src/tools/rc/lexer.l
index 0310293cfb..a17f79507e 100644
--- a/src/tools/rc/lexer.l
+++ b/src/tools/rc/lexer.l
@@ -89,7 +89,7 @@ resource                 return RESOURCE;
 array                    return ARRAY;
 message                  return MESSAGE;
 archive                  return ARCHIVE;
-type                     return TYPE;
+type                     return RTYPE;
 import                   return IMPORT;
 
 false                    yylval.b = false; return BOOL;
diff --git a/src/tools/rc/parser.y b/src/tools/rc/parser.y
index 7b4e6d203c..cf5cc9301a 100644
--- a/src/tools/rc/parser.y
+++ b/src/tools/rc/parser.y
@@ -118,7 +118,7 @@ static void add_resource(res_id_t, type_code, data_t);
 	type_t T;
 }
 
-%token ENUM RESOURCE ARCHIVE ARRAY MESSAGE TYPE IMPORT
+%token ENUM RESOURCE ARCHIVE ARRAY MESSAGE RTYPE IMPORT
 
 %token <b> BOOL
 %token <i> INTEGER
@@ -182,11 +182,11 @@ symboldef
 	;
 
 typedef
-	: TYPE id TYPECODE IDENT '{' typedeffields '}' ';'
+	: RTYPE id TYPECODE IDENT '{' typedeffields '}' ';'
 		{
 			add_user_type($2, $3, $4, $6);
 		}
-	| TYPE id IDENT '{' typedeffields '}' ';'
+	| RTYPE id IDENT '{' typedeffields '}' ';'
 		{
 			add_user_type($2, B_RAW_TYPE, $3, $5);
 		}