diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index dcacc5850..042e98258 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit dcacc5850f13f3580bd759481e81d892062a8b89
+Subproject commit 042e98258792c472639ffcf91f3a2519e0679373
diff --git a/project/jni/application/opentyrian/src/loudness.h b/project/jni/application/opentyrian/src/loudness.h
index f51a459ff..6b8a068e6 100644
--- a/project/jni/application/opentyrian/src/loudness.h
+++ b/project/jni/application/opentyrian/src/loudness.h
@@ -22,6 +22,7 @@
 #include "opentyr.h"
 #include "opl.h"
 
+
 #include "SDL.h"
 
 #define SFX_CHANNELS 8
diff --git a/project/jni/application/opentyrian/src/opl.c b/project/jni/application/opentyrian/src/opl.c
index a4071c53a..57c68d1c5 100644
--- a/project/jni/application/opentyrian/src/opl.c
+++ b/project/jni/application/opentyrian/src/opl.c
@@ -30,6 +30,30 @@
 #include <string.h> // memset()
 #include "opl.h"
 
+// per-chip variables
+Bitu chip_num;
+op_type op[MAXOPERATORS];
+
+Bits int_samplerate;
+
+Bit8u status;
+Bit32u opl_index;
+#if defined(OPLTYPE_IS_OPL3)
+Bit8u adlibreg[512];	// adlib register set (including second set)
+Bit8u wave_sel[44];		// waveform selection
+#else
+Bit8u adlibreg[256];	// adlib register set
+Bit8u wave_sel[22];		// waveform selection
+#endif
+
+
+// vibrato/tremolo increment/counter
+Bit32u vibtab_pos;
+Bit32u vibtab_add;
+Bit32u tremtab_pos;
+Bit32u tremtab_add;
+
+
 static Bit32u generator_add;	// should be a chip parameter
 
 static fltype recipsamp;	// inverse of sampling rate
diff --git a/project/jni/application/opentyrian/src/opl.h b/project/jni/application/opentyrian/src/opl.h
index c8e643b8b..03310d364 100644
--- a/project/jni/application/opentyrian/src/opl.h
+++ b/project/jni/application/opentyrian/src/opl.h
@@ -149,27 +149,27 @@ typedef struct operator_struct {
 } op_type;
 
 // per-chip variables
-Bitu chip_num;
-op_type op[MAXOPERATORS];
+extern Bitu chip_num;
+extern op_type op[MAXOPERATORS];
 
-Bits int_samplerate;
+extern Bits int_samplerate;
 	
-Bit8u status;
-Bit32u opl_index;
+extern Bit8u status;
+extern Bit32u opl_index;
 #if defined(OPLTYPE_IS_OPL3)
-Bit8u adlibreg[512];	// adlib register set (including second set)
-Bit8u wave_sel[44];		// waveform selection
+extern Bit8u adlibreg[512];	// adlib register set (including second set)
+extern Bit8u wave_sel[44];		// waveform selection
 #else
-Bit8u adlibreg[256];	// adlib register set
-Bit8u wave_sel[22];		// waveform selection
+extern Bit8u adlibreg[256];	// adlib register set
+extern Bit8u wave_sel[22];		// waveform selection
 #endif
 
 
 // vibrato/tremolo increment/counter
-Bit32u vibtab_pos;
-Bit32u vibtab_add;
-Bit32u tremtab_pos;
-Bit32u tremtab_add;
+extern Bit32u vibtab_pos;
+extern Bit32u vibtab_add;
+extern Bit32u tremtab_pos;
+extern Bit32u tremtab_add;
 
 
 // enable an operator