diff --git a/vm/image.cpp b/vm/image.cpp
index 746461680c..91fa1b801b 100755
--- a/vm/image.cpp
+++ b/vm/image.cpp
@@ -19,7 +19,6 @@ void init_objects(image_header *h)
 	return vm->init_objects(h);
 }
 
-cell data_relocation_base;
 
 void factorvm::load_data_heap(FILE *file, image_header *h, vm_parameters *p)
 {
@@ -59,7 +58,6 @@ void load_data_heap(FILE *file, image_header *h, vm_parameters *p)
 	return vm->load_data_heap(file,h,p);
 }
 
-cell code_relocation_base;
 
 void factorvm::load_code_heap(FILE *file, image_header *h, vm_parameters *p)
 {
diff --git a/vm/inline_cache.cpp b/vm/inline_cache.cpp
index b6a90b1ff4..15d8fcb203 100755
--- a/vm/inline_cache.cpp
+++ b/vm/inline_cache.cpp
@@ -3,14 +3,6 @@
 namespace factor
 {
 
-cell max_pic_size;
-
-cell cold_call_to_ic_transitions;
-cell ic_to_pic_transitions;
-cell pic_to_mega_transitions;
-
-/* PIC_TAG, PIC_HI_TAG, PIC_TUPLE, PIC_HI_TAG_TUPLE */
-cell pic_counts[4];
 
 void factorvm::init_inline_caching(int max_size)
 {
diff --git a/vm/inline_cache.hpp b/vm/inline_cache.hpp
index e2a6ae8cf9..e354d30677 100644
--- a/vm/inline_cache.hpp
+++ b/vm/inline_cache.hpp
@@ -1,8 +1,5 @@
 namespace factor
 {
-
-extern cell max_pic_size;
-
 void init_inline_caching(int max_size);
 
 PRIMITIVE(reset_inline_cache_stats);
diff --git a/vm/vm.hpp b/vm/vm.hpp
index 8a0808397d..813bf5c528 100644
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -489,6 +489,8 @@ struct factorvm {
 	void compact_code_heap();
 
 	//image
+	cell code_relocation_base;
+	cell data_relocation_base;
 	void init_objects(image_header *h);
 	void load_data_heap(FILE *file, image_header *h, vm_parameters *p);
 	void load_code_heap(FILE *file, image_header *h, vm_parameters *p);
@@ -578,6 +580,11 @@ struct factorvm {
 	inline void vmprim_dispatch_stats();
 
 	//inline cache
+	cell max_pic_size;
+	cell cold_call_to_ic_transitions;
+	cell ic_to_pic_transitions;
+	cell pic_to_mega_transitions;
+	cell pic_counts[4];  /* PIC_TAG, PIC_HI_TAG, PIC_TUPLE, PIC_HI_TAG_TUPLE */
 	void init_inline_caching(int max_size);
 	void deallocate_inline_cache(cell return_address);
 	cell determine_inline_cache_type(array *cache_entries);