From c79510ef3408e06f284dda734cf731d7d2d3115f Mon Sep 17 00:00:00 2001
From: Thomas Geymayer <tomgey@gmail.com>
Date: Sun, 4 Nov 2012 23:03:06 +0100
Subject: [PATCH] Fix include and compiler warning

---
 src/Scripting/ClipboardX11.cxx | 3 ++-
 src/Scripting/NasalCanvas.cxx  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Scripting/ClipboardX11.cxx b/src/Scripting/ClipboardX11.cxx
index 5e005011c..c8747863b 100644
--- a/src/Scripting/ClipboardX11.cxx
+++ b/src/Scripting/ClipboardX11.cxx
@@ -308,7 +308,8 @@ class ClipboardX11:
     struct Property
     {
       unsigned char *data;
-      int format, num_items;
+      int format;
+      unsigned long num_items;
       Atom type;
     };
 
diff --git a/src/Scripting/NasalCanvas.cxx b/src/Scripting/NasalCanvas.cxx
index 2d14dea30..08f7b9b3c 100644
--- a/src/Scripting/NasalCanvas.cxx
+++ b/src/Scripting/NasalCanvas.cxx
@@ -34,7 +34,7 @@
 #include <simgear/sg_inlines.h>
 
 #include <simgear/canvas/Canvas.hxx>
-#include <simgear/canvas/elements/element.hxx>
+#include <simgear/canvas/elements/CanvasElement.hxx>
 
 static naRef canvasPrototype;
 static naRef elementPrototype;