diff --git a/src/gba/GBALink.cpp b/src/gba/GBALink.cpp
index ff856809..4a3722fa 100644
--- a/src/gba/GBALink.cpp
+++ b/src/gba/GBALink.cpp
@@ -14,8 +14,6 @@
 #define snprintf _snprintf
 #endif
 
-#ifndef NO_LINK
-
 static int vbaid = 0;
 const char *MakeInstanceFilename(const char *Input)
 {
@@ -32,6 +30,8 @@ const char *MakeInstanceFilename(const char *Input)
 	return result;
 }
 
+#ifndef NO_LINK
+
 // The usual min/max functions for built-in types.
 //
 // template<typename T> T min( T x, T y ) { return x < y ? x : y; }
@@ -2691,5 +2691,6 @@ void lclient::Send() {
 	lanlink.tcpsocket.Send(outbuffer, 4);
 	return;
 }
-
+#else
+bool gba_joybus_active = false;
 #endif
\ No newline at end of file
diff --git a/src/win32/LinkOptions.cpp b/src/win32/LinkOptions.cpp
index 463936df..595e60be 100644
--- a/src/win32/LinkOptions.cpp
+++ b/src/win32/LinkOptions.cpp
@@ -293,9 +293,6 @@ void LinkOptions::UpdateAvailability()
 	GetDlgItem(IDC_LINK4P)->EnableWindow(isNetwork && m_server);
 }
 
-#endif // NO_LINK
-
-
 void LinkOptions::OnBnClickedLinkServer()
 {
 	UpdateData(TRUE);
@@ -308,3 +305,5 @@ void LinkOptions::OnBnClickedLinkClient()
 	UpdateData(TRUE);
 	UpdateAvailability();
 }
+
+#endif // NO_LINK
diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index 68a08a25..f25c8351 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -349,9 +349,9 @@ VBA::~VBA()
     *p = 0;
 
   regInit(winBuffer);
-
+#ifndef NO_LINK
   CloseLink();
-
+#endif
   saveSettings();
 
   if(moviePlaying) {