diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h
index 367ea2cb3..477fa006a 100644
--- a/tools/qfcc/include/qfcc.h
+++ b/tools/qfcc/include/qfcc.h
@@ -352,26 +352,6 @@ typedef union eval_s
 	union eval_s		*ptr;
 } eval_t;	
 
-extern	type_t	type_void;
-extern	type_t	type_string;
-extern	type_t	type_float;
-extern	type_t	type_vector;
-extern	type_t	type_entity;
-extern	type_t	type_field;
-extern	type_t	type_function;
-extern	type_t	type_pointer;
-extern	type_t	type_floatfield;
-extern	type_t	type_quaternion;
-extern	type_t	type_integer;
-extern	type_t	type_uinteger;
-extern	type_t	type_short;
-extern	type_t	type_struct;
-extern	type_t	type_id;
-extern	type_t	type_SEL;
-
-extern	def_t	def_void;
-extern	def_t	def_function;
-
 struct function_s
 {
 	struct function_s	*next;
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 9fa805349..0d3468671 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -32,6 +32,26 @@
 #ifndef __type_h
 #define __type_h
 
+extern	type_t	type_void;
+extern	type_t	type_string;
+extern	type_t	type_float;
+extern	type_t	type_vector;
+extern	type_t	type_entity;
+extern	type_t	type_field;
+extern	type_t	type_function;
+extern	type_t	type_pointer;
+extern	type_t	type_floatfield;
+extern	type_t	type_quaternion;
+extern	type_t	type_integer;
+extern	type_t	type_uinteger;
+extern	type_t	type_short;
+extern	type_t	type_struct;
+extern	type_t	type_id;
+extern	type_t	type_SEL;
+
+extern	def_t	def_void;
+extern	def_t	def_function;
+
 type_t *find_type (type_t *new);
 void new_typedef (const char *name, struct type_s *type);
 struct type_s *get_typedef (const char *name);
diff --git a/tools/qfcc/source/emit.c b/tools/qfcc/source/emit.c
index 91b460761..779c7353b 100644
--- a/tools/qfcc/source/emit.c
+++ b/tools/qfcc/source/emit.c
@@ -36,6 +36,7 @@ static const char rcsid[] =
 #include <QF/va.h>
 
 #include "qfcc.h"
+#include "type.h"
 #include "qc-parse.h"
 
 def_t      *emit_sub_expr (expr_t *e, def_t *dest);
diff --git a/tools/qfcc/source/pr_imm.c b/tools/qfcc/source/pr_imm.c
index b82f47320..8b8c13e84 100644
--- a/tools/qfcc/source/pr_imm.c
+++ b/tools/qfcc/source/pr_imm.c
@@ -25,6 +25,7 @@ static const char rcsid[] =
 #include "QF/hash.h"
 
 #include "qfcc.h"
+#include "type.h"
 
 static hashtab_t *string_imm_defs;
 static hashtab_t *float_imm_defs;
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 9d2815c10..7e9f84aba 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -63,6 +63,7 @@ static const char rcsid[] =
 #include <QF/sys.h>
 
 #include "qfcc.h"
+#include "type.h"
 
 options_t   options;
 
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index f86f8940c..4fae3efba 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -34,6 +34,7 @@ static const char rcsid[] =
 #include <QF/sys.h>
 
 #include "qfcc.h"
+#include "type.h"
 #include "switch.h"
 #include "qc-parse.h"