diff --git a/network_udp.c b/network_udp.c
index 28e5a03015..1e369d42ca 100644
--- a/network_udp.c
+++ b/network_udp.c
@@ -43,7 +43,7 @@ enum {
 #define DEF_UDP_RECEIVE_COMMAND(type) void NetworkPacketReceive_ ## type ## _command(Packet *p, struct sockaddr_in *client_addr)
 void NetworkSendUDP_Packet(SOCKET udp, Packet *p, struct sockaddr_in *recv);
 
-NetworkClientState _udp_cs;
+static NetworkClientState _udp_cs;
 
 DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_CLIENT_FIND_SERVER)
 {
diff --git a/signs.c b/signs.c
index e40f05da3c..160ac3d194 100644
--- a/signs.c
+++ b/signs.c
@@ -10,6 +10,8 @@
 #include "command.h"
 #include "variables.h"
 
+static SignStruct *_new_sign_struct;
+
 enum {
 	/* Max signs: 64000 (4 * 16000) */
 	SIGN_POOL_BLOCK_SIZE_BITS = 2,       /* In bits, so (1 << 2) == 4 */
diff --git a/signs.h b/signs.h
index 7c6b92ec01..1da92266d6 100644
--- a/signs.h
+++ b/signs.h
@@ -51,8 +51,6 @@ static inline bool IsSignIndex(uint index)
 #define FOR_ALL_SIGNS_FROM(ss, start) for (ss = GetSign(start); ss != NULL; ss = (ss->index + 1 < GetSignPoolSize()) ? GetSign(ss->index + 1) : NULL)
 #define FOR_ALL_SIGNS(ss) FOR_ALL_SIGNS_FROM(ss, 0)
 
-VARDEF SignStruct *_new_sign_struct;
-
 VARDEF bool _sign_sort_dirty;
 VARDEF uint16 *_sign_sort;
 
diff --git a/terraform_gui.c b/terraform_gui.c
index 8b04caf2a6..7113b6dd0e 100644
--- a/terraform_gui.c
+++ b/terraform_gui.c
@@ -10,7 +10,6 @@
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
-#include "gfx.h"
 #include "sound.h"
 #include "command.h"
 #include "vehicle.h"