diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c198d0..8c8e0b1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,6 +39,7 @@ set(SOURCES_TUXMATH
   game.c
   menu.c
   menu_lan.c
+  mysetenv.c
   highscore.c
   lessons.c
   mathcards.c
diff --git a/src/comets.c b/src/comets.c
index 84c9b6e..05ed601 100644
--- a/src/comets.c
+++ b/src/comets.c
@@ -175,6 +175,8 @@ SDL_Rect player_left_pos = {0};
 
 static help_controls_type help_controls;
 
+SDL_Thread *tts_announcer_thread;
+
 /* Local function prototypes: */
 static int  comets_initialize(void);
 static void comets_cleanup(void);
@@ -4152,7 +4154,6 @@ int tts_announcer(void *unused)
 	return 0;
 }
 void start_tts_announcer_thread(){
-	extern SDL_Thread *tts_announcer_thread;
 	tts_announcer_thread = SDL_CreateThread(tts_announcer,NULL);
 }
 
@@ -4160,5 +4161,3 @@ void stop_tts_announcer_thread(){
 	tts_announcer_switch = 0;
 	T4K_Tts_stop();
 }
-
-
diff --git a/src/globals.h b/src/globals.h
index 24cc610..aafeff6 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -186,7 +186,7 @@ extern char **lesson_list_filenames;
 extern int* lesson_list_goldstars;
 extern int num_lessons;
 
-SDL_Thread *tts_announcer_thread;
+extern SDL_Thread *tts_announcer_thread;
 
 #endif
 
diff --git a/src/menu_lan.c b/src/menu_lan.c
index 4512eb1..9751b42 100644
--- a/src/menu_lan.c
+++ b/src/menu_lan.c
@@ -36,8 +36,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "menu_lan.h"
 
 
-/* lan_player_type now defined in network.h */
-lan_player_type lan_player_info[MAX_CLIENTS];
+/* lan_player_type now defined in network.h; added extern for lan_player_info so it's only defined once */
+extern lan_player_type lan_player_info[MAX_CLIENTS];
 
 /* Local function prototypes: ------------------- */
 void draw_player_table(void);