diff --git a/configure.ac b/configure.ac
index 2deaeea6b..123de211b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -768,7 +768,7 @@ PKG_CHECK_MODULES([SDLIMAGE], [SDL_image],
                   [have_sdlimage=yes],
                   [have_sdlimage=no])
 if test x$have_sdlimage = xyes; then
-   SDLIMAGE_CFLAGS="$SDL_CFLAGS"
+   SDLIMAGE_CFLAGS="$SDL_CFLAGS -I/usr/include/SDL"
    SDLIMAGE_LIBS="$SDL_LIBS -lSDL_image -ljpeg"
    FREEJ_SAVE_FLAGS
    CFLAGS="$SDLIMAGE_CFLAGS"
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b9024812..845860a7c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,6 @@ SOURCES = \
 \
         tvfreq.c		unicap_layer.cpp \
 	v4l2_layer.cpp \
-				image_layer.cpp \
 	text_layer.cpp 		generator_layer.cpp \
 	geo_layer.cpp		flash_layer.cpp \
 	xscreensaver_layer.cpp   \
@@ -49,6 +48,10 @@ SOURCES = \
 	theorautils.cpp 	oggtheora_encoder.cpp \
 	impl_video_encoders.cpp
 
+# 				image_layer.cpp
+
+# 		image_layer_js.cpp
+
 JS_SOURCES = 	context_js.cpp  \
 		parameter_js.cpp \
 		layer_js.cpp    \
@@ -57,7 +60,6 @@ JS_SOURCES = 	context_js.cpp  \
 		callbacks_js.cpp \
 		video_encoder_js.cpp \
 		cam_layer_js.cpp \
-		image_layer_js.cpp \
 		text_layer_js.cpp \
 		geo_layer_js.cpp \
 		generator_layer_js.cpp \
diff --git a/src/context.cpp b/src/context.cpp
index b67fa029b..3675f6933 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -646,18 +646,18 @@ Layer *Context::open(char *file, int w, int h) {
       error("VIDEO and AVI layer support not compiled");
       act("can't load %s",file_ptr);
 #endif
-  } else /* IMAGE LAYER */
-      if( (IS_IMAGE_EXTENSION(end_file_ptr))) {
-//		strncasecmp((end_file_ptr-4),".png",4)==0) 
-	      nlayer = new ImageLayer();
-              if(!nlayer->init()) {
-                error("failed initialization of layer %s for %s", nlayer->name, file_ptr);
-                delete nlayer; return NULL;
-              }
-	      if(!nlayer->open(file_ptr)) {
-		  error("create_layer : IMG open failed");
-		  delete nlayer; nlayer = NULL;
-	      }
+//   } else /* IMAGE LAYER */
+//       if( (IS_IMAGE_EXTENSION(end_file_ptr))) {
+// //		strncasecmp((end_file_ptr-4),".png",4)==0)
+// 	      nlayer = new ImageLayer();
+//               if(!nlayer->init()) {
+//                 error("failed initialization of layer %s for %s", nlayer->name, file_ptr);
+//                 delete nlayer; return NULL;
+//               }
+// 	      if(!nlayer->open(file_ptr)) {
+// 		  error("create_layer : IMG open failed");
+// 		  delete nlayer; nlayer = NULL;
+// 	      }
   } else /* TXT LAYER */
     if(strncasecmp((end_file_ptr-4),".txt",4)==0) {
 #if defined WITH_TEXTLAYER
diff --git a/src/include/impl_layers.h b/src/include/impl_layers.h
index 42a75f8b1..28c085972 100644
--- a/src/include/impl_layers.h
+++ b/src/include/impl_layers.h
@@ -28,7 +28,7 @@
 /* software layers which don't need special loaders */
 #include <generator_layer.h>
 #include <geo_layer.h>
-#include <image_layer.h> // statically included sdl_image
+// #include <image_layer.h> // statically included sdl_image
 
 #include <goom_layer.h>
 
diff --git a/src/jsparser.cpp b/src/jsparser.cpp
index 613d5da0c..bf012bc4b 100644
--- a/src/jsparser.cpp
+++ b/src/jsparser.cpp
@@ -169,12 +169,12 @@ void JsExecutionContext::init_class() {
     generator_layer_methods,
     object_proto);
 
-  REGISTER_CLASS("ImageLayer",
-    image_layer_class,
-    image_layer_constructor,
-    NULL,
-    image_layer_methods,
-    object_proto);
+  // REGISTER_CLASS("ImageLayer",
+  //   image_layer_class,
+  //   image_layer_constructor,
+  //   NULL,
+  //   image_layer_methods,
+  //   object_proto);
 
 #ifdef WITH_FLASH
   REGISTER_CLASS("FlashLayer",