Merge important bits from canvas-image.h into imageframe.h

diff --git a/gtk2_ardour/imageframe.h b/gtk2_ardour/imageframe.h
index 466d0804f5e9d740a9916ab859db64e869be9856..a752cdbce04c09aaf73f7f9ca285d3c625fd9e83 100644 (file)
--- a/gtk2_ardour/imageframe.h
+++ b/gtk2_ardour/imageframe.h
@@ -27,10 +27,23 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdint.h>
 #include <libgnomecanvasmm/item.h>
 #include <libgnomecanvasmm/group.h>
 #include <libgnomecanvasmm/shape.h>
-#include "canvas-imageframe.h"
+
+#include <libgnomecanvas/libgnomecanvas.h>
+#include <gtk/gtkenums.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <libart_lgpl/art_misc.h>
+#ifdef __cplusplus
+}
+#endif
+
+#include <libart_lgpl/art_pixbuf.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS