diff --git a/src/add-ons/accelerants/nvidia/engine/nv_globals.c b/src/add-ons/accelerants/nvidia/engine/nv_globals.c
index 18905a9aab..8277d777a5 100644
--- a/src/add-ons/accelerants/nvidia/engine/nv_globals.c
+++ b/src/add-ons/accelerants/nvidia/engine/nv_globals.c
@@ -19,6 +19,48 @@ display_mode *my_mode_list;
 area_id	my_mode_list_area;
 int accelerantIsClone;
 
+crtc_interrupt_enable	head1_interrupt_enable;
+crtc_update_fifo		head1_update_fifo;
+crtc_validate_timing 	head1_validate_timing;
+crtc_set_timing 		head1_set_timing;
+crtc_depth				head1_depth;
+crtc_dpms				head1_dpms;
+crtc_set_display_pitch	head1_set_display_pitch;
+crtc_set_display_start	head1_set_display_start;
+crtc_cursor_init		head1_cursor_init;
+crtc_cursor_show		head1_cursor_show;
+crtc_cursor_hide		head1_cursor_hide;
+crtc_cursor_define		head1_cursor_define;
+crtc_cursor_position	head1_cursor_position;
+crtc_stop_tvout			head1_stop_tvout;
+crtc_start_tvout		head1_start_tvout;
+
+crtc_interrupt_enable	head2_interrupt_enable;
+crtc_update_fifo		head2_update_fifo;
+crtc_validate_timing	head2_validate_timing;
+crtc_set_timing			head2_set_timing;
+crtc_depth				head2_depth;
+crtc_dpms				head2_dpms;
+crtc_set_display_pitch	head2_set_display_pitch;
+crtc_set_display_start	head2_set_display_start;
+crtc_cursor_init		head2_cursor_init;
+crtc_cursor_show		head2_cursor_show;
+crtc_cursor_hide		head2_cursor_hide;
+crtc_cursor_define		head2_cursor_define;
+crtc_cursor_position	head2_cursor_position;
+crtc_stop_tvout			head2_stop_tvout;
+crtc_start_tvout		head2_start_tvout;
+
+dac_mode				head1_mode;
+dac_palette				head1_palette;
+dac_set_pix_pll			head1_set_pix_pll;
+dac_pix_pll_find		head1_pix_pll_find;
+
+dac_mode				head2_mode;
+dac_palette				head2_palette;
+dac_set_pix_pll			head2_set_pix_pll;
+dac_pix_pll_find		head2_pix_pll_find;
+
 nv_get_set_pci nv_pci_access=
 	{
 		NV_PRIVATE_DATA_MAGIC,
diff --git a/src/add-ons/accelerants/nvidia/engine/nv_globals.h b/src/add-ons/accelerants/nvidia/engine/nv_globals.h
index c31f202c12..ccc611cb87 100644
--- a/src/add-ons/accelerants/nvidia/engine/nv_globals.h
+++ b/src/add-ons/accelerants/nvidia/engine/nv_globals.h
@@ -32,44 +32,44 @@ typedef status_t (*dac_palette)(uint8[256], uint8[256], uint8[256]);
 typedef status_t (*dac_set_pix_pll)(display_mode);
 typedef status_t (*dac_pix_pll_find)(display_mode, float*, uint8*, uint8*, uint8*, uint8);
 
-crtc_interrupt_enable	head1_interrupt_enable;
-crtc_update_fifo		head1_update_fifo;
-crtc_validate_timing 	head1_validate_timing;
-crtc_set_timing 		head1_set_timing;
-crtc_depth				head1_depth;
-crtc_dpms				head1_dpms;
-crtc_set_display_pitch	head1_set_display_pitch;
-crtc_set_display_start	head1_set_display_start;
-crtc_cursor_init		head1_cursor_init;
-crtc_cursor_show		head1_cursor_show;
-crtc_cursor_hide		head1_cursor_hide;
-crtc_cursor_define		head1_cursor_define;
-crtc_cursor_position	head1_cursor_position;
-crtc_stop_tvout			head1_stop_tvout;
-crtc_start_tvout		head1_start_tvout;
+extern crtc_interrupt_enable	head1_interrupt_enable;
+extern crtc_update_fifo		head1_update_fifo;
+extern crtc_validate_timing 	head1_validate_timing;
+extern crtc_set_timing 		head1_set_timing;
+extern crtc_depth				head1_depth;
+extern crtc_dpms				head1_dpms;
+extern crtc_set_display_pitch	head1_set_display_pitch;
+extern crtc_set_display_start	head1_set_display_start;
+extern crtc_cursor_init		head1_cursor_init;
+extern crtc_cursor_show		head1_cursor_show;
+extern crtc_cursor_hide		head1_cursor_hide;
+extern crtc_cursor_define		head1_cursor_define;
+extern crtc_cursor_position	head1_cursor_position;
+extern crtc_stop_tvout			head1_stop_tvout;
+extern crtc_start_tvout		head1_start_tvout;
 
-crtc_interrupt_enable	head2_interrupt_enable;
-crtc_update_fifo		head2_update_fifo;
-crtc_validate_timing	head2_validate_timing;
-crtc_set_timing			head2_set_timing;
-crtc_depth				head2_depth;
-crtc_dpms				head2_dpms;
-crtc_set_display_pitch	head2_set_display_pitch;
-crtc_set_display_start	head2_set_display_start;
-crtc_cursor_init		head2_cursor_init;
-crtc_cursor_show		head2_cursor_show;
-crtc_cursor_hide		head2_cursor_hide;
-crtc_cursor_define		head2_cursor_define;
-crtc_cursor_position	head2_cursor_position;
-crtc_stop_tvout			head2_stop_tvout;
-crtc_start_tvout		head2_start_tvout;
+extern crtc_interrupt_enable	head2_interrupt_enable;
+extern crtc_update_fifo		head2_update_fifo;
+extern crtc_validate_timing	head2_validate_timing;
+extern crtc_set_timing			head2_set_timing;
+extern crtc_depth				head2_depth;
+extern crtc_dpms				head2_dpms;
+extern crtc_set_display_pitch	head2_set_display_pitch;
+extern crtc_set_display_start	head2_set_display_start;
+extern crtc_cursor_init		head2_cursor_init;
+extern crtc_cursor_show		head2_cursor_show;
+extern crtc_cursor_hide		head2_cursor_hide;
+extern crtc_cursor_define		head2_cursor_define;
+extern crtc_cursor_position	head2_cursor_position;
+extern crtc_stop_tvout			head2_stop_tvout;
+extern crtc_start_tvout		head2_start_tvout;
 
-dac_mode				head1_mode;
-dac_palette				head1_palette;
-dac_set_pix_pll			head1_set_pix_pll;
-dac_pix_pll_find		head1_pix_pll_find;
+extern dac_mode				head1_mode;
+extern dac_palette				head1_palette;
+extern dac_set_pix_pll			head1_set_pix_pll;
+extern dac_pix_pll_find		head1_pix_pll_find;
 
-dac_mode				head2_mode;
-dac_palette				head2_palette;
-dac_set_pix_pll			head2_set_pix_pll;
-dac_pix_pll_find		head2_pix_pll_find;
+extern dac_mode				head2_mode;
+extern dac_palette				head2_palette;
+extern dac_set_pix_pll			head2_set_pix_pll;
+extern dac_pix_pll_find		head2_pix_pll_find;
diff --git a/src/add-ons/accelerants/via/engine/globals.c b/src/add-ons/accelerants/via/engine/globals.c
index 9b879fd780..8bfc4ca07c 100644
--- a/src/add-ons/accelerants/via/engine/globals.c
+++ b/src/add-ons/accelerants/via/engine/globals.c
@@ -18,6 +18,42 @@ display_mode *my_mode_list;
 area_id	my_mode_list_area;
 int accelerantIsClone;
 
+crtc_validate_timing 	head1_validate_timing;
+crtc_set_timing 		head1_set_timing;
+crtc_depth				head1_depth;
+crtc_dpms				head1_dpms;
+crtc_dpms_fetch			head1_dpms_fetch;
+crtc_set_display_pitch	head1_set_display_pitch;
+crtc_set_display_start	head1_set_display_start;
+crtc_cursor_init		head1_cursor_init;
+crtc_cursor_show		head1_cursor_show;
+crtc_cursor_hide		head1_cursor_hide;
+crtc_cursor_define		head1_cursor_define;
+crtc_cursor_position	head1_cursor_position;
+
+crtc_validate_timing	head2_validate_timing;
+crtc_set_timing			head2_set_timing;
+crtc_depth				head2_depth;
+crtc_dpms				head2_dpms;
+crtc_dpms_fetch			head2_dpms_fetch;
+crtc_set_display_pitch	head2_set_display_pitch;
+crtc_set_display_start	head2_set_display_start;
+crtc_cursor_init		head2_cursor_init;
+crtc_cursor_show		head2_cursor_show;
+crtc_cursor_hide		head2_cursor_hide;
+crtc_cursor_define		head2_cursor_define;
+crtc_cursor_position	head2_cursor_position;
+
+dac_mode				head1_mode;
+dac_palette				head1_palette;
+dac_set_pix_pll			head1_set_pix_pll;
+dac_pix_pll_find		head1_pix_pll_find;
+
+dac_mode				head2_mode;
+dac_palette				head2_palette;
+dac_set_pix_pll			head2_set_pix_pll;
+dac_pix_pll_find		head2_pix_pll_find;
+
 eng_get_set_pci eng_pci_access=
 	{
 		VIA_PRIVATE_DATA_MAGIC,
diff --git a/src/add-ons/accelerants/via/engine/globals.h b/src/add-ons/accelerants/via/engine/globals.h
index 6561c0e3b1..79a9f5cb81 100644
--- a/src/add-ons/accelerants/via/engine/globals.h
+++ b/src/add-ons/accelerants/via/engine/globals.h
@@ -29,38 +29,38 @@ typedef status_t (*dac_palette)(uint8[256], uint8[256], uint8[256]);
 typedef status_t (*dac_set_pix_pll)(display_mode);
 typedef status_t (*dac_pix_pll_find)(display_mode, float*, uint8*, uint8*, uint8*, uint8);
 
-crtc_validate_timing 	head1_validate_timing;
-crtc_set_timing 		head1_set_timing;
-crtc_depth				head1_depth;
-crtc_dpms				head1_dpms;
-crtc_dpms_fetch			head1_dpms_fetch;
-crtc_set_display_pitch	head1_set_display_pitch;
-crtc_set_display_start	head1_set_display_start;
-crtc_cursor_init		head1_cursor_init;
-crtc_cursor_show		head1_cursor_show;
-crtc_cursor_hide		head1_cursor_hide;
-crtc_cursor_define		head1_cursor_define;
-crtc_cursor_position	head1_cursor_position;
+extern crtc_validate_timing 	head1_validate_timing;
+extern crtc_set_timing 		head1_set_timing;
+extern crtc_depth				head1_depth;
+extern crtc_dpms				head1_dpms;
+extern crtc_dpms_fetch			head1_dpms_fetch;
+extern crtc_set_display_pitch	head1_set_display_pitch;
+extern crtc_set_display_start	head1_set_display_start;
+extern crtc_cursor_init		head1_cursor_init;
+extern crtc_cursor_show		head1_cursor_show;
+extern crtc_cursor_hide		head1_cursor_hide;
+extern crtc_cursor_define		head1_cursor_define;
+extern crtc_cursor_position	head1_cursor_position;
 
-crtc_validate_timing	head2_validate_timing;
-crtc_set_timing			head2_set_timing;
-crtc_depth				head2_depth;
-crtc_dpms				head2_dpms;
-crtc_dpms_fetch			head2_dpms_fetch;
-crtc_set_display_pitch	head2_set_display_pitch;
-crtc_set_display_start	head2_set_display_start;
-crtc_cursor_init		head2_cursor_init;
-crtc_cursor_show		head2_cursor_show;
-crtc_cursor_hide		head2_cursor_hide;
-crtc_cursor_define		head2_cursor_define;
-crtc_cursor_position	head2_cursor_position;
+extern crtc_validate_timing	head2_validate_timing;
+extern crtc_set_timing			head2_set_timing;
+extern crtc_depth				head2_depth;
+extern crtc_dpms				head2_dpms;
+extern crtc_dpms_fetch			head2_dpms_fetch;
+extern crtc_set_display_pitch	head2_set_display_pitch;
+extern crtc_set_display_start	head2_set_display_start;
+extern crtc_cursor_init		head2_cursor_init;
+extern crtc_cursor_show		head2_cursor_show;
+extern crtc_cursor_hide		head2_cursor_hide;
+extern crtc_cursor_define		head2_cursor_define;
+extern crtc_cursor_position	head2_cursor_position;
 
-dac_mode				head1_mode;
-dac_palette				head1_palette;
-dac_set_pix_pll			head1_set_pix_pll;
-dac_pix_pll_find		head1_pix_pll_find;
+extern dac_mode				head1_mode;
+extern dac_palette				head1_palette;
+extern dac_set_pix_pll			head1_set_pix_pll;
+extern dac_pix_pll_find		head1_pix_pll_find;
 
-dac_mode				head2_mode;
-dac_palette				head2_palette;
-dac_set_pix_pll			head2_set_pix_pll;
-dac_pix_pll_find		head2_pix_pll_find;
+extern dac_mode				head2_mode;
+extern dac_palette				head2_palette;
+extern dac_set_pix_pll			head2_set_pix_pll;
+extern dac_pix_pll_find		head2_pix_pll_find;