--- a/src/gaslist.inc	Wed Apr 10 10:51:07 2019 +0200
+++ b/src/gaslist.inc	Mon Jun 03 14:01:48 2019 +0200
@@ -1,6 +1,6 @@
 ;=============================================================================
 ;
-;   File gaslist.inc													V2.99c
+;   File gaslist.inc                          combined next generation V3.03.1
 ;
 ;   Interface to OSTC gas list management.
 ;
@@ -13,30 +13,42 @@
 	extern	gaslist_strcat_gas
 	extern	gaslist_strcat_gas_WREG
 	extern	gaslist_strcat_gas_cd
-	extern	gaslist_strcat_setpoint
-
+	extern	gaslist_show_mix				; put "Nxlo", "Txlo/hi", "Air" or "O2" into Postinc2
 	extern	do_toggle_gf_label
-	extern	do_toggle_max_pres_diff_label
-	extern	gaslist_copy_dil_to_oc
+
+ IFDEF _cave_mode
+	extern	do_turn_dive_label
+ ENDIF
 
-	; Setpoint Setup
+
+	; Setpoints and Diluents
+ IFDEF _ccr_pscr
+	extern	gaslist_strcat_setpoint
 	extern	gaslist_spplus
 	extern	gaslist_spdepthplus
 	extern	gaslist_spdepthminus
+	extern	gaslist_copy_dil_to_oc
+ ENDIF
+
 
 	; Select currently edited Gas
 	extern	gaslist_gastitle
 
+
 	; Main Gaslist Menu
 	extern	gaslist_pO2
 	extern	gaslist_mO2
-	extern	gaslist_pHe
-	extern	gaslist_mHe
 	extern	gaslist_GasDepth
 	extern	gaslist_show_type
 	extern	gaslist_toggle_type
 	extern	gaslist_cleanup_list
 
+ IFDEF _helium
+	extern	gaslist_pHe
+	extern	gaslist_mHe
+ ENDIF
+
+
 	; Depth Sub-Menu
 	extern	gaslist_pDepth
 	extern	gaslist_mDepth
@@ -45,15 +57,14 @@
 	extern	gaslist_reset_mod_title
 	extern	gaslist_reset_mod
 
+
 	; Tank Sub-Menu
 	extern	gaslist_tank_size_pres
 	extern	gaslist_tank_size
 	extern	gaslist_tank_pres
+
  IFDEF _rx_functions
 	extern	gaslist_tank_id_pres
 	extern	gaslist_tank_pairing
+	extern	do_toggle_max_pres_diff_label
  ENDIF
-
- IFDEF _cave_mode
-	extern	do_turn_dive_label
- ENDIF
\ No newline at end of file