diff --git a/source/common/gameconfigfile.cpp b/source/common/gameconfigfile.cpp
index 8ae39bf06..dd4c0889e 100644
--- a/source/common/gameconfigfile.cpp
+++ b/source/common/gameconfigfile.cpp
@@ -48,7 +48,7 @@
 #define LASTRUNVERSION "1"
 
 #if !defined _MSC_VER && !defined __APPLE__
-//#include "i_system.h"  // for SHARE_DIR
+#include "i_system.h"  // for SHARE_DIR
 #endif // !_MSC_VER && !__APPLE__
 
 FGameConfigFile::FGameConfigFile ()
diff --git a/source/platform/posix/unix/gtk_dialogs.cpp b/source/platform/posix/unix/gtk_dialogs.cpp
index 697d5a721..48f8c06fc 100644
--- a/source/platform/posix/unix/gtk_dialogs.cpp
+++ b/source/platform/posix/unix/gtk_dialogs.cpp
@@ -55,10 +55,10 @@ typedef enum
 #endif
 
 #include "c_cvars.h"
-#include "d_main.h"
 #include "i_module.h"
 #include "i_system.h"
 #include "version.h"
+#include "gamecontrol.h"
 
 EXTERN_CVAR (Bool, queryiwad);
 
@@ -207,7 +207,7 @@ static int PickIWad (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
 
 	// Create the dialog window.
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	mysnprintf(caption, countof(caption), GAMESIG " %s: Select an IWAD to use", GetVersionString());
+	snprintf(caption, countof(caption), GAMENAME " %s: Select an IWAD to use", GetVersionString());
 	gtk_window_set_title (GTK_WINDOW(window), caption);
 	gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER);
 	gtk_window_set_gravity (GTK_WINDOW(window), GDK_GRAVITY_CENTER);
diff --git a/source/platform/posix/unix/i_specialpaths.cpp b/source/platform/posix/unix/i_specialpaths.cpp
index 73af21bf0..8944dab1a 100644
--- a/source/platform/posix/unix/i_specialpaths.cpp
+++ b/source/platform/posix/unix/i_specialpaths.cpp
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include "i_system.h"
 #include "cmdlib.h"
-#include "doomerrors.h"
+#include "printf.h"
 
 #include "version.h"	// for GAMENAME