diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index d6e3d2ce48e..1def595068d 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -116,7 +116,6 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) :
 	_screen_changeid(0),
 	_egl_surface_width(0),
 	_egl_surface_height(0),
-	_htc_fail(true),
 	_force_redraw(false),
 	_game_texture(0),
 	_game_pbuf(),
@@ -136,7 +135,6 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) :
 	_virtcontrols_on(false),
 	_enable_zoning(false),
 	_mixer(0),
-	_shake_offset(0),
 	_queuedEventTime(0),
 	_event_queue_lock(createMutex()),
 	_touch_pt_down(),
@@ -165,10 +163,6 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) :
 			getSystemProperty("ro.product.cpu.abi").c_str());
 
 	mf.toLowercase();
-	/*_htc_fail = mf.contains("htc");
-
-	if (_htc_fail)
-		LOGI("Enabling HTC workaround");*/
 }
 
 OSystem_Android::~OSystem_Android() {
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h
index 75eaf623601..fa957b44bc1 100644
--- a/backends/platform/android/android.h
+++ b/backends/platform/android/android.h
@@ -31,6 +31,7 @@
 #include "graphics/palette.h"
 #include "graphics/surface.h"
 #include "graphics/pixelbuffer.h"
+#include "graphics/opengles2/system_headers.h"
 #include "graphics/opengles2/framebuffer.h"
 #include "backends/base-backend.h"
 #include "backends/plugins/posix/posix-provider.h"
@@ -44,9 +45,6 @@
 
 #include <android/log.h>
 
-#include <GLES/gl.h>
-#include <GLES/glext.h>
-
 // toggles start
 //#define ANDROID_DEBUG_ENTER
 //#define ANDROID_DEBUG_GL
@@ -109,7 +107,6 @@ private:
 	int _screen_changeid;
 	int _egl_surface_width;
 	int _egl_surface_height;
-	bool _htc_fail;
 
 	bool _force_redraw;
 
@@ -120,7 +117,6 @@ private:
 	Graphics::PixelBuffer _game_pbuf;
 	Graphics::FrameBuffer *_frame_buffer;
 
-	int _shake_offset;
 	Common::Rect _focus_rect;
 
 	// Overlay layer
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index 1cdfda7f61b..b469ebefc47 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -484,26 +484,9 @@ void OSystem_Android::updateScreen() {
 		}
 
 		// clear pointer leftovers in dead areas
-		// also, HTC's GLES drivers are made of fail and don't preserve the buffer
-		// ( http://www.khronos.org/registry/egl/specs/EGLTechNote0001.html )
-		if ((_show_overlay || _htc_fail) && !_fullscreen)
+		if ((_show_overlay) && !_fullscreen)
 			clearScreen(kClear);
 
-// TODO: Do we have engines that use this?
-#if 0
-		if (_shake_offset != 0 ||
-				(!_focus_rect.isEmpty() &&
-				!Common::Rect(_game_texture->width(),
-								_game_texture->height()).contains(_focus_rect))) {
-			// These are the only cases where _game_texture doesn't
-			// cover the entire screen.
-			clearScreen(kClear);
-
-			// Move everything up by _shake_offset (game) pixels
-			GLCALL(glTranslatex(0, -_shake_offset << 16, 0));
-		}
-#endif
-
 	// TODO this doesnt work on those sucky drivers, do it differently
 	//	if (_show_overlay)
 	//		GLCALL(glColor4ub(0x9f, 0x9f, 0x9f, 0x9f));
@@ -604,12 +587,7 @@ void OSystem_Android::unlockScreen() {
 }
 
 void OSystem_Android::setShakePos(int shake_offset) {
-	ENTER("%d", shake_offset);
-
-	if (_shake_offset != shake_offset) {
-		_shake_offset = shake_offset;
-		_force_redraw = true;
-	}
+	/* not used in any engine */
 }
 
 void OSystem_Android::fillScreen(uint32 col) {