From a0823420c37b50a4b01eb8b0801769341c0ffacf Mon Sep 17 00:00:00 2001
From: Michael Martin <mcmartin@gmail.com>
Date: Fri, 3 Apr 2020 22:20:14 -0700
Subject: [PATCH] Fix some merge wobbles in headers

---
 sc2/src/libs/input/sdl/input.c | 2 --
 sc2/src/uqm/cnctdlg.h          | 2 --
 2 files changed, 4 deletions(-)

diff --git a/sc2/src/libs/input/sdl/input.c b/sc2/src/libs/input/sdl/input.c
index d2b78014e..82d911f6e 100644
--- a/sc2/src/libs/input/sdl/input.c
+++ b/sc2/src/libs/input/sdl/input.c
@@ -220,8 +220,6 @@ TFB_SetInputVectors (volatile int menu[], int num_menu_, volatile int flight[],
 	num_flight = num_flight_;
 }
 
-#ifdef HAVE_JOYSTICK
-
 static void
 initJoystick (void)
 {
diff --git a/sc2/src/uqm/cnctdlg.h b/sc2/src/uqm/cnctdlg.h
index 019535545..c785e1ce1 100644
--- a/sc2/src/uqm/cnctdlg.h
+++ b/sc2/src/uqm/cnctdlg.h
@@ -21,8 +21,6 @@
 #ifndef UQM_CNCTDLG_H_
 #define UQM_CNCTDLG_H_
 
-#ifdef NETPLAY
-
 #include "libs/compiler.h"
 
 #if defined(__cplusplus)