diff --git a/Makefile b/Makefile
index af28159aa..c5cfd86c6 100644
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,14 @@ else
 	LINKER_OPTS += -lpng -ljpeg
 	DEFINES += -DSK_BUILD_FOR_UNIX
 
+    # these are our registry-based factories
+	SRC_LIST += src/images/SkImageDecoder_Factory.cpp
+	SRC_LIST += src/images/SkImageEncoder_Factory.cpp
+    # this is our list of optional codecs
 	SRC_LIST += src/images/SkImageDecoder_libpng.cpp
 	SRC_LIST += src/images/SkImageDecoder_libjpeg.cpp
+    # support files
+	SRC_LIST += src/images/SkScaledBitmapSampler.cpp
 endif
 
 out/%.o : %.cpp
diff --git a/src/ports/SkImageDecoder_Factory.cpp b/src/images/SkImageDecoder_Factory.cpp
similarity index 100%
rename from src/ports/SkImageDecoder_Factory.cpp
rename to src/images/SkImageDecoder_Factory.cpp
diff --git a/src/ports/SkImageEncoder_Factory.cpp b/src/images/SkImageEncoder_Factory.cpp
similarity index 100%
rename from src/ports/SkImageEncoder_Factory.cpp
rename to src/images/SkImageEncoder_Factory.cpp