diff --git a/api/baseapi.cpp b/api/baseapi.cpp
index 29c251c6..58d27d69 100644
--- a/api/baseapi.cpp
+++ b/api/baseapi.cpp
@@ -1652,7 +1652,7 @@ void TessBaseAPI::GetFeatures(INT_FEATURE_ARRAY int_features,
   for (block_it.mark_cycle_pt (); !block_it.cycled_list ();
        block_it.forward ()) {
     BLOCK* block = block_it.data();
-#ifndef SCROLLVIEW_DISABLED
+#ifndef GRAPHICS_DISABLED
     extract_edges(NULL,         // Scrollview window.
                   &page_image,  // Image.
                   &page_image,  // Thresholded image.
diff --git a/ccmain/adaptions.cpp b/ccmain/adaptions.cpp
index 1f35ccd8..3eff06fa 100644
--- a/ccmain/adaptions.cpp
+++ b/ccmain/adaptions.cpp
@@ -556,7 +556,7 @@ void Tesseract::adapt_to_good_ems(WERD_RES *word,
 
   static inT32 word_number = 0;
 
-#ifndef SCROLLVIEW_DISABLED
+#ifndef GRAPHICS_DISABLED
   ScrollView* demo_win = NULL;
 #endif
 
@@ -794,7 +794,7 @@ void Tesseract::adapt_to_good_samples(WERD_RES *word,
 
   static inT32 word_number = 0;
 
-#ifndef SCROLLVIEW_DISABLED
+#ifndef GRAPHICS_DISABLED
   ScrollView* demo_win = NULL;
 #endif
 
diff --git a/configure.ac b/configure.ac
index 6527d383..ce54f7d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,19 +73,9 @@ AC_ARG_WITH(extra-libraries,
             AC_MSG_ERROR([Cannot stat directory $withval])
           fi ] )
 
-AC_MSG_CHECKING(--enable-scrollview argument)
-AC_ARG_ENABLE(scrollview,
-    [  --enable-scrollview         Enable scrollview (default).],
-    [enable_scrollview=$enableval],
-    [enable_scrollview="yes"])
-AC_MSG_RESULT($enable_scrollview)
-if test "$enable_scrollview" = "no"; then
-  AC_DEFINE([DISABLE_SCROLLVIEW], [], [Disable scrollview])
-fi
-
 AC_MSG_CHECKING(--enable-graphics argument)
 AC_ARG_ENABLE(graphics,
-    [  --enable-graphics         Enable graphics (default).],
+    [  --enable-graphics         Enable graphics (ScrollView) (default).],
     [enable_graphics=$enableval],
     [enable_graphics="yes"])
 AC_MSG_RESULT($enable_graphics)
@@ -364,7 +354,7 @@ AC_CONFIG_FILES(tessdata/Makefile)
 AC_CONFIG_FILES(tessdata/configs/Makefile)
 AC_CONFIG_FILES(tessdata/tessconfigs/Makefile)
 AC_CONFIG_FILES(testing/Makefile)
-if test "$enable_scrollview" = "yes"; then
+if test "$enable_graphics" = "yes"; then
 AC_CONFIG_FILES(java/Makefile)
 AC_CONFIG_FILES(java/com/Makefile)
 AC_CONFIG_FILES(java/com/google/Makefile)
@@ -406,12 +396,7 @@ AH_BOTTOM([
 /* Miscellaneous defines */
 #define AUTOCONF 1
 
-#ifdef DISABLE_SCROLLVIEW
-#define SCROLLVIEW_DISABLED
-#endif
-
 #ifdef DISABLE_GRAPHICS
-#define SCROLLVIEW_DISABLED
 #define GRAPHICS_DISABLED
 #endif
 
diff --git a/textord/alignedblob.cpp b/textord/alignedblob.cpp
index fbea76ee..4c0e63c2 100644
--- a/textord/alignedblob.cpp
+++ b/textord/alignedblob.cpp
@@ -174,7 +174,7 @@ bool AlignedBlob::WithinTestRegion(int detail_level, int x, int y) {
 // Display the tab codes of the BLOBNBOXes in this grid.
 ScrollView* AlignedBlob::DisplayTabs(const char* window_name,
                                      ScrollView* tab_win) {
-#ifndef SCROLLVIEW_DISABLED
+#ifndef GRAPHICS_DISABLED
   if (tab_win == NULL)
     tab_win = MakeWindow(0, 50, window_name);
   // For every tab in the grid, display it.
diff --git a/wordrec/drawfx.cpp b/wordrec/drawfx.cpp
index 548c34f3..f71dec66 100644
--- a/wordrec/drawfx.cpp
+++ b/wordrec/drawfx.cpp
@@ -27,7 +27,7 @@
 #include          "werd.h"
 #include          "drawfx.h"
 
-#ifndef SCROLLVIEW_DISABLED
+#ifndef GRAPHICS_DISABLED
 #define FXDEMOWIN     "FXDemo"
 #define FXDEMOXPOS      250
 #define FXDEMOYPOS      0
@@ -79,7 +79,7 @@ void clear_fx_win() {  //make features win
   fx_win->Line(-WERDWIDTH, bln_x_height + bln_baseline_offset, WERDWIDTH, bln_x_height + bln_baseline_offset);
 }
 
-#endif  // SCROLLVIEW_DISABLED
+#endif  // GRAPHICS_DISABLED
 
 /**********************************************************************
  * create_fxdebug_win