Only in old: AUTHORS.txt
Only in old: ChangeLog
Only in old: ImageMagick.spec.in
Only in old: Install-mac.txt
Only in old: Install-unix.txt
Only in old: Install-vms.txt
Only in old: Install-windows.txt
Only in old: LICENSE
Only in old: Magick++
Only in old: Magickshr.opt
Only in old: Make.com
Only in old: Makefile.am
Only in old: Makefile.in
Only in old: NEWS.txt
Only in old: NOTICE
Only in old: PerlMagick
Only in old: Platforms.txt
Only in old: QuickStart.txt
Only in old: README.txt
Only in old: aclocal.m4
Only in old: check-headers.c
Only in old: coders
Only in old: config
Only in old: configure
Only in old: configure.ac
Only in old: filters
Only in old: images
Only in old: index.html
Only in old: ltdl
Only in old: m4
Only in old/magick: ImageMagick.h
Only in old/magick: ImageMagick.pc.in
Only in old/magick: Magick-config.1
Only in old/magick: Magick-config.in
Only in old/magick: MagickCore-config.1
Only in old/magick: MagickCore-config.in
diff -U 3 -r -x '*.o.cmd' -- old/magick/MagickCore.h new/magick/MagickCore.h
--- old/magick/MagickCore.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/MagickCore.h	2011-03-31 12:25:28.362999988 +0200
@@ -26,7 +26,7 @@
 #if !defined(_MAGICKCORE_CONFIG_H)
 # define _MAGICKCORE_CONFIG_H
 # if !defined(vms) && !defined(macintosh)
-#  include "magick/magick-config.h"
+#  include "magick-config.h"
 # else
 #  include "magick-config.h"
 # endif
@@ -121,88 +121,88 @@
 #if defined(MAGICKCORE_NAMESPACE_PREFIX)
 # include "magick/methods.h"
 #endif
-#include "magick/magick-type.h"
-#include "magick/accelerate.h"
-#include "magick/animate.h"
-#include "magick/annotate.h"
-#include "magick/artifact.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/cipher.h"
-#include "magick/client.h"
-#include "magick/coder.h"
-#include "magick/color.h"
-#include "magick/colorspace.h"
-#include "magick/colormap.h"
-#include "magick/compare.h"
-#include "magick/composite.h"
-#include "magick/compress.h"
-#include "magick/configure.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/delegate.h"
-#include "magick/deprecate.h"
-#include "magick/display.h"
-#include "magick/distort.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/feature.h"
-#include "magick/fourier.h"
-#include "magick/fx.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/hashmap.h"
-#include "magick/histogram.h"
-#include "magick/identify.h"
-#include "magick/image.h"
-#include "magick/image-view.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/locale_.h"
-#include "magick/log.h"
-#include "magick/magic.h"
-#include "magick/magick.h"
-#include "magick/matrix.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/mime.h"
-#include "magick/monitor.h"
-#include "magick/montage.h"
-#include "magick/morphology.h"
-#include "magick/option.h"
-#include "magick/paint.h"
-#include "magick/pixel.h"
-#include "magick/policy.h"
-#include "magick/prepress.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/registry.h"
-#include "magick/random_.h"
-#include "magick/resample.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/segment.h"
-#include "magick/shear.h"
-#include "magick/signature.h"
-#include "magick/splay-tree.h"
-#include "magick/stream.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/timer.h"
-#include "magick/token.h"
-#include "magick/transform.h"
-#include "magick/threshold.h"
-#include "magick/type.h"
-#include "magick/utility.h"
-#include "magick/version.h"
-#include "magick/xml-tree.h"
-#include "magick/xwindow.h"
+#include "magick-type.h"
+#include "accelerate.h"
+#include "animate.h"
+#include "annotate.h"
+#include "artifact.h"
+#include "attribute.h"
+#include "blob.h"
+#include "cache.h"
+#include "cache-view.h"
+#include "cipher.h"
+#include "client.h"
+#include "coder.h"
+#include "color.h"
+#include "colorspace.h"
+#include "colormap.h"
+#include "compare.h"
+#include "composite.h"
+#include "compress.h"
+#include "configure.h"
+#include "constitute.h"
+#include "decorate.h"
+#include "delegate.h"
+#include "deprecate.h"
+#include "display.h"
+#include "distort.h"
+#include "draw.h"
+#include "effect.h"
+#include "enhance.h"
+#include "exception.h"
+#include "feature.h"
+#include "fourier.h"
+#include "fx.h"
+#include "gem.h"
+#include "geometry.h"
+#include "hashmap.h"
+#include "histogram.h"
+#include "identify.h"
+#include "image.h"
+#include "image-view.h"
+#include "layer.h"
+#include "list.h"
+#include "locale_.h"
+#include "log.h"
+#include "magic.h"
+#include "magick.h"
+#include "matrix.h"
+#include "memory_.h"
+#include "module.h"
+#include "mime.h"
+#include "monitor.h"
+#include "montage.h"
+#include "morphology.h"
+#include "option.h"
+#include "paint.h"
+#include "pixel.h"
+#include "policy.h"
+#include "prepress.h"
+#include "profile.h"
+#include "property.h"
+#include "quantize.h"
+#include "quantum.h"
+#include "registry.h"
+#include "random_.h"
+#include "resample.h"
+#include "resize.h"
+#include "resource_.h"
+#include "segment.h"
+#include "shear.h"
+#include "signature.h"
+#include "splay-tree.h"
+#include "stream.h"
+#include "statistic.h"
+#include "string_.h"
+#include "timer.h"
+#include "token.h"
+#include "transform.h"
+#include "threshold.h"
+#include "type.h"
+#include "utility.h"
+#include "version.h"
+#include "xml-tree.h"
+#include "xwindow.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
Only in old/magick: MagickCore.pc.in
Only in old/magick: Make.com
Only in old/magick: Makefile.am
Only in old/magick: PreRvIcccm.c
Only in old/magick: PreRvIcccm.h
Only in old/magick: accelerate.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/accelerate.h new/magick/accelerate.h
--- old/magick/accelerate.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/accelerate.h	2011-03-31 12:35:50.162999983 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include <magick/morphology.h>
+#include "morphology.h"
 
 extern MagickExport MagickBooleanType
   AccelerateConvolveImage(const Image *,const KernelInfo *,Image *,
Only in old/magick: animate-private.h
Only in old/magick: animate.c
Only in old/magick: animate.h
Only in old/magick: annotate.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/annotate.h new/magick/annotate.h
--- old/magick/annotate.h	2011-01-24 15:14:53.000000000 +0100
+++ new/magick/annotate.h	2011-03-31 12:41:21.474999983 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/draw.h"
+#include "draw.h"
 
 extern MagickExport MagickBooleanType
   AnnotateComponentGenesis(void),
Only in old/magick: api.h
Only in old/magick: artifact.c
Only in old/magick: artifact.h
Only in old/magick: attribute.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/attribute.h new/magick/attribute.h
--- old/magick/attribute.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/attribute.h	2011-03-31 13:11:20.801999982 +0200
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#include <magick/image.h>
-#include <magick/exception.h>
+#include "image.h"
+#include "exception.h"
 
 extern MagickExport ImageType
   GetImageType(const Image *,ExceptionInfo *);
Only in old/magick: blob-private.h
Only in old/magick: blob.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/blob.h new/magick/blob.h
--- old/magick/blob.h	2011-02-07 01:33:21.000000000 +0100
+++ new/magick/blob.h	2011-03-31 13:00:10.700999982 +0200
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#include "magick/image.h"
-#include "magick/stream.h"
+#include "image.h"
+#include "stream.h"
 
 #define MagickMaxBufferExtent  (32*8192)
 
Only in old/magick: cache-private.h
Only in old/magick: cache-view.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/cache-view.h new/magick/cache-view.h
--- old/magick/cache-view.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/cache-view.h	2011-03-31 13:01:34.040999983 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/pixel.h"
+#include "pixel.h"
 
 typedef enum
 {
Only in old/magick: cache.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/cache.h new/magick/cache.h
--- old/magick/cache.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/cache.h	2011-03-31 13:13:46.962999982 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/blob.h"
+#include "blob.h"
 
 extern MagickExport const IndexPacket
   *GetVirtualIndexQueue(const Image *);
Only in old/magick: cipher.c
Only in old/magick: cipher.h
Only in old/magick: client.c
Only in old/magick: client.h
Only in old/magick: coder.c
Only in old/magick: coder.h
Only in old/magick: color-private.h
Only in old/magick: color.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/color.h new/magick/color.h
--- old/magick/color.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/color.h	2011-03-31 12:50:26.252999982 +0200
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#include <magick/pixel.h>
-#include <magick/exception.h>
+#include "pixel.h"
+#include "exception.h"
 
 typedef enum
 {
Only in old/magick: colormap-private.h
Only in old/magick: colormap.c
Only in old/magick: colormap.h
Only in old/magick: colorspace-private.h
Only in old/magick: colorspace.c
Only in old/magick: colorspace.h
Only in old/magick: compare.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/compare.h new/magick/compare.h
--- old/magick/compare.h	2010-12-11 03:17:57.000000000 +0100
+++ new/magick/compare.h	2011-03-31 13:14:43.609999983 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/image.h"
+#include "image.h"
 
 typedef enum
 {
Only in old/magick: composite-private.h
Only in old/magick: composite.c
Only in old/magick: composite.h
Only in old/magick: compress.c
Only in old/magick: compress.h
Only in old/magick: config.h_vms
Only in old/magick: configure.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/configure.h new/magick/configure.h
--- old/magick/configure.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/configure.h	2011-03-31 13:15:58.705999982 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/hashmap.h"
+#include "hashmap.h"
 
 typedef struct _ConfigureInfo
 {
Only in old/magick: constitute.c
Only in old/magick: constitute.h
Only in old/magick: decorate.c
Only in old/magick: decorate.h
Only in old/magick: delegate-private.h
Only in old/magick: delegate.c
Only in old/magick: delegate.h
Only in old/magick: deprecate.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/deprecate.h new/magick/deprecate.h
--- old/magick/deprecate.h	2011-03-18 22:29:28.000000000 +0100
+++ new/magick/deprecate.h	2011-03-31 13:20:03.271999984 +0200
@@ -25,16 +25,16 @@
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
 
 #include <stdarg.h>
-#include "magick/blob.h"
-#include "magick/cache-view.h"
-#include "magick/draw.h"
-#include "magick/constitute.h"
-#include "magick/magick-config.h"
-#include "magick/pixel.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/registry.h"
-#include "magick/semaphore.h"
+#include "blob.h"
+#include "cache-view.h"
+#include "draw.h"
+#include "constitute.h"
+#include "magick-config.h"
+#include "pixel.h"
+#include "quantize.h"
+#include "quantum.h"
+#include "registry.h"
+#include "semaphore.h"
 
 #if !defined(magick_attribute)
 #  if !defined(__GNUC__)
Only in old/magick: display-private.h
Only in old/magick: display.c
Only in old/magick: display.h
Only in old/magick: distort.c
Only in old/magick: distort.h
Only in old/magick: draw-private.h
Only in old/magick: draw.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/draw.h new/magick/draw.h
--- old/magick/draw.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/draw.h	2011-03-31 12:44:06.299999983 +0200
@@ -22,10 +22,10 @@
 extern "C" {
 #endif
 
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/pixel.h"
-#include "magick/type.h"
+#include "geometry.h"
+#include "image.h"
+#include "pixel.h"
+#include "type.h"
 
 typedef enum
 {
Only in old/magick: effect.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/effect.h new/magick/effect.h
--- old/magick/effect.h	2011-03-29 02:51:23.000000000 +0200
+++ new/magick/effect.h	2011-03-31 13:03:10.296999983 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include <magick/morphology.h>
+#include "morphology.h"
 
 typedef enum
 {
Only in old/magick: enhance.c
Only in old/magick: enhance.h
Only in old/magick: exception-private.h
Only in old/magick: exception.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/exception.h new/magick/exception.h
--- old/magick/exception.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/exception.h	2011-03-31 12:55:31.478999983 +0200
@@ -23,7 +23,7 @@
 #endif
 
 #include <stdarg.h>
-#include "magick/semaphore.h"
+#include "semaphore.h"
 
 typedef enum
 {
Only in old/magick: feature.c
Only in old/magick: feature.h
Only in old/magick: fourier.c
Only in old/magick: fourier.h
Only in old/magick: fx-private.h
Only in old/magick: fx.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/fx.h new/magick/fx.h
--- old/magick/fx.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/fx.h	2011-03-31 13:21:46.152999983 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/draw.h"
+#include "draw.h"
 
 typedef enum
 {
Only in old/magick: gem.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/gem.h new/magick/gem.h
--- old/magick/gem.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/gem.h	2011-03-31 13:22:57.528999984 +0200
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#include <magick/fx.h>
-#include <magick/random_.h>
+#include "fx.h"
+#include "random_.h"
 
 extern MagickExport double
   ExpandAffine(const AffineMatrix *),
Only in old/magick: geometry.c
Only in old/magick: geometry.h
Only in old/magick: hashmap.c
Only in old/magick: hashmap.h
Only in old/magick: histogram.c
Only in old/magick: histogram.h
Only in old/magick: identify.c
Only in old/magick: identify.h
Only in old/magick: image-private.h
Only in old/magick: image-view.c
Only in old/magick: image-view.h
Only in old/magick: image.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/image.h new/magick/image.h
--- old/magick/image.h	2011-03-25 11:08:53.000000000 +0100
+++ new/magick/image.h	2011-03-31 12:58:08.667999983 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include <magick/color.h>
+#include "color.h"
 
 #define OpaqueOpacity  ((Quantum) 0UL)
 #define TransparentOpacity  ((Quantum) QuantumRange)
@@ -125,24 +125,24 @@
     white_point;
 } ChromaticityInfo;
 
-#include "magick/blob.h"
-#include "magick/colorspace.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/composite.h"
-#include "magick/compress.h"
-#include "magick/effect.h"
-#include "magick/geometry.h"
-#include "magick/layer.h"
-#include "magick/monitor.h"
-#include "magick/pixel.h"
-#include "magick/profile.h"
-#include "magick/quantum.h"
-#include "magick/resample.h"
-#include "magick/resize.h"
-#include "magick/semaphore.h"
-#include "magick/stream.h"
-#include "magick/timer.h"
+#include "blob.h"
+#include "colorspace.h"
+#include "cache-view.h"
+#include "color.h"
+#include "composite.h"
+#include "compress.h"
+#include "effect.h"
+#include "geometry.h"
+#include "layer.h"
+#include "monitor.h"
+#include "pixel.h"
+#include "profile.h"
+#include "quantum.h"
+#include "resample.h"
+#include "resize.h"
+#include "semaphore.h"
+#include "stream.h"
+#include "timer.h"
 
 struct _Image
 {
Only in old/magick: layer.c
Only in old/magick: layer.h
Only in old/magick: list.c
Only in old/magick: list.h
Only in old/magick: locale.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/locale_.h new/magick/locale_.h
--- old/magick/locale_.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/locale_.h	2011-03-31 13:28:40.367999982 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/hashmap.h"
+#include "hashmap.h"
 
 typedef struct _LocaleInfo
 {
Only in old/magick: log.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/log.h new/magick/log.h
--- old/magick/log.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/log.h	2011-03-31 13:30:00.926999982 +0200
@@ -23,7 +23,7 @@
 #endif
 
 #include <stdarg.h>
-#include "magick/exception.h"
+#include "exception.h"
 
 #if !defined(GetMagickModule)
 # define GetMagickModule()  __FILE__,__func__,(unsigned long) __LINE__
Only in old/magick: mac.c
Only in old/magick: mac.h
Only in old/magick: magic.c
Only in old/magick: magic.h
Only in old/magick: magick-config.h
diff -U 3 -r -x '*.o.cmd' -- old/magick/magick-type.h new/magick/magick-type.h
--- old/magick/magick-type.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/magick-type.h	2011-03-31 12:28:39.428999985 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/magick-config.h"
+#include "magick-config.h"
 
 #if !defined(MAGICKCORE_QUANTUM_DEPTH)
 #define MAGICKCORE_QUANTUM_DEPTH  16
Only in old/magick: magick.c
Only in old/magick: magick.h
Only in old/magick: matrix.c
Only in old/magick: matrix.h
Only in old/magick: memory.c
Only in old/magick: memory_.h
Only in old/magick: methods.h
Only in old/magick: mime-private.h
Only in old/magick: mime.c
Only in old/magick: mime.h
Only in old/magick: module.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/module.h new/magick/module.h
--- old/magick/module.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/module.h	2011-03-31 13:31:08.974999982 +0200
@@ -23,7 +23,7 @@
 #endif
 
 #include <time.h>
-#include "magick/version.h"
+#include "version.h"
 
 #define MagickImageCoderSignature  ((size_t) \
   (((MagickLibVersion) << 8) | MAGICKCORE_QUANTUM_DEPTH))
Only in old/magick: monitor-private.h
Only in old/magick: monitor.c
Only in old/magick: monitor.h
Only in old/magick: montage.c
Only in old/magick: montage.h
Only in old/magick: morphology-private.h
Only in old/magick: morphology.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/morphology.h new/magick/morphology.h
--- old/magick/morphology.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/morphology.h	2011-03-31 12:38:49.826999983 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include <magick/geometry.h>
+#include "geometry.h"
 
 typedef enum
 {
Only in old/magick: nt-base.c
Only in old/magick: nt-base.h
Only in old/magick: nt-feature.c
Only in old/magick: nt-feature.h
Only in old/magick: option.c
Only in old/magick: option.h
Only in old/magick: paint.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/paint.h new/magick/paint.h
--- old/magick/paint.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/paint.h	2011-03-31 13:32:55.811999983 +0200
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#include "magick/color.h"
-#include "magick/draw.h"
+#include "color.h"
+#include "draw.h"
 
 extern MagickExport Image
   *OilPaintImage(const Image *,const double,ExceptionInfo *);
Only in old/magick: pixel-private.h
Only in old/magick: pixel.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/pixel.h new/magick/pixel.h
--- old/magick/pixel.h	2011-03-26 03:10:53.000000000 +0100
+++ new/magick/pixel.h	2011-03-31 12:51:58.086999983 +0200
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#include <magick/colorspace.h>
-#include <magick/constitute.h>
+#include "colorspace.h"
+#include "constitute.h"
 
 #define ClampRedPixelComponent(p) ClampToQuantum((p)->red)
 #define ClampGreenPixelComponent(p) ClampToQuantum((p)->green)
Only in old/magick: policy.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/policy.h new/magick/policy.h
--- old/magick/policy.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/policy.h	2011-03-31 13:34:07.600999982 +0200
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#include <magick/pixel.h>
-#include <magick/exception.h>
+#include "pixel.h"
+#include "exception.h"
 
 typedef enum
 {
Only in old/magick: prepress.c
Only in old/magick: prepress.h
Only in old/magick: profile.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/profile.h new/magick/profile.h
--- old/magick/profile.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/profile.h	2011-03-31 13:04:38.757999982 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/string_.h"
+#include "string_.h"
 
 typedef struct _ProfileInfo
 {
Only in old/magick: property.c
Only in old/magick: property.h
Only in old/magick: quantize.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/quantize.h new/magick/quantize.h
--- old/magick/quantize.h	2011-02-09 16:12:01.000000000 +0100
+++ new/magick/quantize.h	2011-03-31 13:19:00.915999982 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/colorspace.h"
+#include "colorspace.h"
 
 typedef enum
 {
Only in old/magick: quantum-export.c
Only in old/magick: quantum-import.c
Only in old/magick: quantum-private.h
Only in old/magick: quantum.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/quantum.h new/magick/quantum.h
--- old/magick/quantum.h	2010-08-23 15:37:35.000000000 +0200
+++ new/magick/quantum.h	2011-03-31 13:08:37.374999983 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/semaphore.h"
+#include "semaphore.h"
 
 #define RoundToQuantum(quantum)  ClampToQuantum(quantum)
 
Only in old/magick: random-private.h
Only in old/magick: random.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/random_.h new/magick/random_.h
--- old/magick/random_.h	2011-02-25 03:43:54.000000000 +0100
+++ new/magick/random_.h	2011-03-31 13:24:51.373999982 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "magick/string_.h"
+#include "string_.h"
 
 /*
   Typedef declarations.
Only in old/magick: registry.c
Only in old/magick: registry.h
Only in old/magick: resample-private.h
Only in old/magick: resample.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/resample.h new/magick/resample.h
--- old/magick/resample.h	2011-03-26 01:21:26.000000000 +0100
+++ new/magick/resample.h	2011-03-31 13:10:02.794999984 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include <magick/cache-view.h>
+#include "cache-view.h"
 
 /*
   WARNING:  The order of this table must also match the order of a table
Only in old/magick: resize-private.h
Only in old/magick: resize.c
Only in old/magick: resize.h
Only in old/magick: resource.c
Only in old/magick: resource_.h
Only in old/magick: segment.c
Only in old/magick: segment.h
Only in old/magick: semaphore-private.h
Only in old/magick: semaphore.c
Only in old/magick: semaphore.h
Only in old/magick: shear.c
Only in old/magick: shear.h
Only in old/magick: signature-private.h
Only in old/magick: signature.c
Only in old/magick: signature.h
Only in old/magick: splay-tree.c
Only in old/magick: splay-tree.h
Only in old/magick: static.c
Only in old/magick: static.h
Only in old/magick: statistic.c
Only in old/magick: statistic.h
Only in old/magick: stream-private.h
Only in old/magick: stream.c
Only in old/magick: stream.h
Only in old/magick: string-private.h
Only in old/magick: string.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/string_.h new/magick/string_.h
--- old/magick/string_.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/string_.h	2011-03-31 13:06:47.113999983 +0200
@@ -24,7 +24,7 @@
 
 #include <stdarg.h>
 #include <time.h>
-#include "magick/exception.h"
+#include "exception.h"
 
 typedef struct _StringInfo
 {
Only in old/magick: studio.h
Only in old/magick: thread-private.h
Only in old/magick: thread.c
Only in old/magick: thread_.h
Only in old/magick: threshold.c
Only in old/magick: threshold.h
Only in old/magick: timer.c
Only in old/magick: timer.h
Only in old/magick: token-private.h
Only in old/magick: token.c
Only in old/magick: token.h
Only in old/magick: transform.c
Only in old/magick: transform.h
Only in old/magick: type.c
Only in old/magick: type.h
Only in old/magick: utility.c
Only in old/magick: utility.h
Only in old/magick: version.c
Only in old/magick: version.h
Only in old/magick: version.h.in
Only in old/magick: vms.c
Only in old/magick: vms.h
Only in old/magick: widget.c
Only in old/magick: widget.h
Only in old/magick: xml-tree.c
diff -U 3 -r -x '*.o.cmd' -- old/magick/xml-tree.h new/magick/xml-tree.h
--- old/magick/xml-tree.h	2010-12-05 00:12:08.000000000 +0100
+++ new/magick/xml-tree.h	2011-03-31 13:35:32.189999983 +0200
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#include <magick/exception.h>
-#include <magick/splay-tree.h>
+#include "exception.h"
+#include "splay-tree.h"
 
 typedef struct _XMLTreeInfo
   XMLTreeInfo;
Only in old/magick: xwdfile.h_vms
Only in old/magick: xwindow-private.h
Only in old/magick: xwindow.c
Only in old/magick: xwindow.h
Only in old: magick.sh.in
Only in old: scenes
Only in old: scripts
Only in old: tests
Only in old: utilities
Only in old: version.sh
Only in old/wand: ChangeLog
Only in old/wand: MagickWand-config.1
Only in old/wand: MagickWand-config.in
diff -U 3 -r -x '*.o.cmd' -- old/wand/MagickWand.h new/wand/MagickWand.h
--- old/wand/MagickWand.h	2010-12-05 00:12:08.000000000 +0100
+++ new/wand/MagickWand.h	2011-03-31 13:51:32.821999982 +0200
@@ -26,7 +26,7 @@
 #if !defined(_MAGICKWAND_CONFIG_H)
 # define _MAGICKWAND_CONFIG_H
 # if !defined(vms) && !defined(macintosh)
-#  include "magick/magick-config.h"
+#  include "../magick/magick-config.h"
 # else
 #  include "magick-config.h"
 # endif
@@ -121,25 +121,25 @@
 typedef struct _MagickWand
   MagickWand;
 
-#include "magick/MagickCore.h"
-#include "wand/animate.h"
-#include "wand/compare.h"
-#include "wand/composite.h"
-#include "wand/conjure.h"
-#include "wand/convert.h"
-#include "wand/deprecate.h"
-#include "wand/display.h"
-#include "wand/drawing-wand.h"
-#include "wand/identify.h"
-#include "wand/import.h"
-#include "wand/magick-property.h"
-#include "wand/magick-image.h"
-#include "wand/mogrify.h"
-#include "wand/montage.h"
-#include "wand/pixel-iterator.h"
-#include "wand/pixel-wand.h"
-#include "wand/stream.h"
-#include "wand/wand-view.h"
+#include "../magick/MagickCore.h"
+#include "animate.h"
+#include "compare.h"
+#include "composite.h"
+#include "conjure.h"
+#include "convert.h"
+#include "deprecate.h"
+#include "display.h"
+#include "drawing-wand.h"
+#include "identify.h"
+#include "import.h"
+#include "magick-property.h"
+#include "magick-image.h"
+#include "mogrify.h"
+#include "montage.h"
+#include "pixel-iterator.h"
+#include "pixel-wand.h"
+#include "stream.h"
+#include "wand-view.h"
 
 extern WandExport char
   *MagickGetException(const MagickWand *,ExceptionType *);
Only in old/wand: MagickWand.pc.in
Only in old/wand: Makefile.am
Only in old/wand: Wand-config.1
Only in old/wand: Wand-config.in
Only in old/wand: Wand.pc.in
Only in old/wand: animate.c
Only in old/wand: animate.h
Only in old/wand: common.sh
Only in old/wand: compare.c
Only in old/wand: compare.h
Only in old/wand: composite.c
Only in old/wand: composite.h
Only in old/wand: conjure.c
Only in old/wand: conjure.h
Only in old/wand: convert.c
Only in old/wand: convert.h
Only in old/wand: deprecate.c
diff -U 3 -r -x '*.o.cmd' -- old/wand/deprecate.h new/wand/deprecate.h
--- old/wand/deprecate.h	2011-03-18 22:29:28.000000000 +0100
+++ new/wand/deprecate.h	2011-03-31 13:53:46.751999982 +0200
@@ -24,10 +24,10 @@
 
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
 
-#include "wand/drawing-wand.h"
-#include "wand/magick-wand.h"
-#include "wand/pixel-iterator.h"
-#include "wand/pixel-wand.h"
+#include "drawing-wand.h"
+#include "magick-wand.h"
+#include "pixel-iterator.h"
+#include "pixel-wand.h"
 
 typedef struct _DrawingWand
   *DrawContext;
Only in old/wand: display.c
Only in old/wand: display.h
Only in old/wand: drawing-wand.c
diff -U 3 -r -x '*.o.cmd' -- old/wand/drawing-wand.h new/wand/drawing-wand.h
--- old/wand/drawing-wand.h	2010-12-05 00:12:08.000000000 +0100
+++ new/wand/drawing-wand.h	2011-03-31 13:49:19.628999983 +0200
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "wand/pixel-wand.h"
+#include "pixel-wand.h"
 
 typedef struct _DrawingWand
   DrawingWand;
Only in old/wand: drawtest.c
Only in old/wand: drawtest.sh
Only in old/wand: identify.c
Only in old/wand: identify.h
Only in old/wand: import.c
Only in old/wand: import.h
Only in old/wand: input_256c.miff
Only in old/wand: input_bilevel.miff
Only in old/wand: input_gray.miff
Only in old/wand: input_truecolor.miff
Only in old/wand: magick-image.c
Only in old/wand: magick-image.h
Only in old/wand: magick-property.c
Only in old/wand: magick-property.h
Only in old/wand: magick-wand-private.h
Only in old/wand: magick-wand.c
diff -U 3 -r -x '*.o.cmd' -- old/wand/magick-wand.h new/wand/magick-wand.h
--- old/wand/magick-wand.h	2010-12-05 00:12:08.000000000 +0100
+++ new/wand/magick-wand.h	2011-03-31 13:54:46.686999982 +0200
@@ -19,6 +19,6 @@
 #ifndef _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
 #define _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
 
-#include "wand/MagickWand.h"
+#include "MagickWand.h"
 
 #endif
Only in old/wand: magick_wand.h
Only in old/wand: mogrify-private.h
Only in old/wand: mogrify.c
Only in old/wand: mogrify.h
Only in old/wand: montage.c
Only in old/wand: montage.h
Only in old/wand: pixel-iterator.c
diff -U 3 -r -x '*.o.cmd' -- old/wand/pixel-iterator.h new/wand/pixel-iterator.h
--- old/wand/pixel-iterator.h	2010-12-05 00:12:08.000000000 +0100
+++ new/wand/pixel-iterator.h	2011-03-31 13:56:23.775999983 +0200
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#include "wand/magick-wand.h"
-#include "wand/pixel-wand.h"
+#include "magick-wand.h"
+#include "pixel-wand.h"
 
 typedef struct _PixelIterator
   PixelIterator;
Only in old/wand: pixel-wand-private.h
Only in old/wand: pixel-wand.c
Only in old/wand: pixel-wand.h
Only in old/wand: sequence.miff
Only in old/wand: stream.c
Only in old/wand: stream.h
Only in old/wand: studio.h
Only in old/wand: wand-view.c
Only in old/wand: wand-view.h
Only in old/wand: wand.c
Only in old/wand: wand.h
Only in old/wand: wandtest.c
Only in old/wand: wandtest.sh
Only in old: wand.h
Only in old: winpath.sh
Only in old: www