diff --git a/indra/llwindow/llwindowheadless.cpp b/indra/llwindow/llwindowheadless.cpp
index 2e811ab23fa3bb97c4d21d48be64f3a9e3cad62e..35398f1c099a628fb08b6528a711bebf899608bd 100644
--- a/indra/llwindow/llwindowheadless.cpp
+++ b/indra/llwindow/llwindowheadless.cpp
@@ -28,7 +28,6 @@
 #include "indra_constants.h"
 
 #include "llwindowheadless.h"
-#include "llgl.h"
 
 //
 // LLWindowHeadless
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 25bdaed0c9085b94d46e3e8a9871e4923ff1a540..0595d6f3c7332c9f2b4b6eea4b1584ccd77eea96 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2640,8 +2640,7 @@ bool LLAppViewer::initWindow()
 	LL_INFOS("AppInit") << "Initializing window..." << LL_ENDL;
 
 	// store setting in a global for easy access and modification
-	gHeadlessClient = gSavedSettings.getBOOL("DisableRendering") 
-				   || gSavedSettings.getBOOL("HeadlessClient");
+	gHeadlessClient = gSavedSettings.getBOOL("HeadlessClient");
 
 	// always start windowed
 	BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");