From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Wed, 29 Oct 2014 17:44:51 +0000 (+0000)
Subject: Fixing the remaining exports from public API
X-Git-Tag: dali_1.0.16~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=226a0a9c08f0b2ba78404e32db98195583f5d791;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Fixing the remaining exports from public API

[Problem]
[Cause]
[Solution]

Change-Id: Id0f8ade613660b4f5a90a768cfb008f72ac0378b
---

diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h
index c8bf646..a62f0b9 100644
--- a/dali/integration-api/core.h
+++ b/dali/integration-api/core.h
@@ -64,7 +64,7 @@ namespace KeepUpdating DALI_IMPORT_API
 /**
  * The status of the Core::Update operation.
  */
-class DALI_IMPORT_API UpdateStatus
+class UpdateStatus
 {
 public:
 
@@ -110,7 +110,7 @@ public:
 /**
  * The status of the Core::Render operation.
  */
-class DALI_IMPORT_API RenderStatus
+class RenderStatus
 {
 public:
 
diff --git a/dali/integration-api/glyph-set.h b/dali/integration-api/glyph-set.h
index 3eee6ba..9474711 100644
--- a/dali/integration-api/glyph-set.h
+++ b/dali/integration-api/glyph-set.h
@@ -38,7 +38,7 @@ typedef IntrusivePtr<GlyphSet> GlyphSetPointer;
 /**
  * A Glyph holds information for a single character.
  */
-struct DALI_IMPORT_API GlyphMetrics
+struct GlyphMetrics
 {
   enum GlyphQuality
   {
@@ -60,7 +60,7 @@ struct DALI_IMPORT_API GlyphMetrics
 /**
  * Stores font global metrics.
  */
-struct DALI_IMPORT_API GlobalMetrics
+struct GlobalMetrics
 {
   GlobalMetrics()
   : lineHeight( 0.f ),
diff --git a/dali/integration-api/resource-types.h b/dali/integration-api/resource-types.h
index 4a1d730..4174b0e 100644
--- a/dali/integration-api/resource-types.h
+++ b/dali/integration-api/resource-types.h
@@ -52,7 +52,7 @@ enum ResourceTypeId
 /**
  * The abstract base class for resource types.
  */
-struct DALI_IMPORT_API ResourceType
+struct ResourceType
 {
   /**
    * Constructor.
@@ -87,7 +87,7 @@ private:
  * BitmapResourceType describes a bitmap resource, which can be requested
  * from ResourceLoader::LoadResource() or AllocateBitmapImage.
  */
-struct DALI_IMPORT_API BitmapResourceType : public ResourceType
+struct BitmapResourceType : public ResourceType
 {
   /**
    * Constructor.
@@ -129,7 +129,7 @@ private:
  * through ResourceManager::AddNativeImage() or requested through ResourceLoader::LoadResource().
  * If the adaptor does not support NativeImages, it can fall back to Bitmap type.
  */
-struct DALI_IMPORT_API NativeImageResourceType : public ResourceType
+struct NativeImageResourceType : public ResourceType
 {
   /**
    * Constructor.
@@ -176,7 +176,7 @@ private:
  * RenderTargetResourceType describes a bitmap resource, which can injected
  * through ResourceManager::AddTargetImage()
  */
-struct DALI_IMPORT_API RenderTargetResourceType : public ResourceType
+struct RenderTargetResourceType : public ResourceType
 {
   /**
    * Constructor.
@@ -223,7 +223,7 @@ private:
  * ShaderResourceType describes a shader program resource, which can be requested
  * from PlatformAbstraction::LoadResource()
  */
-struct DALI_IMPORT_API ShaderResourceType : public ResourceType
+struct ShaderResourceType : public ResourceType
 {
   /**
    * Constructor.
@@ -269,7 +269,7 @@ private:
  * TextResourceType describes a font resource, which can be requested.
  * from PlatformAbstraction::LoadResource()  No font atlas is created.
  */
-struct DALI_IMPORT_API TextResourceType : public ResourceType
+struct TextResourceType : public ResourceType
 {
   /**
    *  Text quality enum
@@ -408,7 +408,7 @@ private:
  * ModelResourceType describes a model resource, which can be requested
  * from PlatformAbstraction::LoadResource()
  */
-struct DALI_IMPORT_API ModelResourceType : public ResourceType
+struct ModelResourceType : public ResourceType
 {
   /**
    * Constructor.
@@ -447,7 +447,7 @@ private:
  * MeshResourceType describes a mesh program resource, which can be created
  * using ResourceManager::AllocateMesh.
  */
-struct DALI_IMPORT_API MeshResourceType : public ResourceType
+struct MeshResourceType : public ResourceType
 {
   /**
    * Constructor.
diff --git a/dali/public-api/actors/actor-enumerations.h b/dali/public-api/actors/actor-enumerations.h
index 484d7f1..ad8560d 100644
--- a/dali/public-api/actors/actor-enumerations.h
+++ b/dali/public-api/actors/actor-enumerations.h
@@ -20,7 +20,7 @@
 
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index b007ce4..9066309 100644
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -30,7 +30,7 @@
 #include <dali/public-api/object/constrainable.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -1366,7 +1366,7 @@ public: // Not intended for application developers
  * actor.Unparent() will be called, followed by actor.Reset().
  * @param[in,out] actor A handle to an actor, or an empty handle.
  */
-void UnparentAndReset( Actor& actor );
+ DALI_IMPORT_API void UnparentAndReset( Actor& actor );
 
 } // namespace Dali
 
diff --git a/dali/public-api/actors/blending.h b/dali/public-api/actors/blending.h
index c3c7628..8bde005 100644
--- a/dali/public-api/actors/blending.h
+++ b/dali/public-api/actors/blending.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace BlendingMode
@@ -83,13 +83,13 @@ enum Type
 
 } // namespace BlendingEquation
 
-extern const BlendingFactor::Type   DEFAULT_BLENDING_SRC_FACTOR_RGB;    ///< BlendingFactor::SRC_ALPHA
-extern const BlendingFactor::Type   DEFAULT_BLENDING_DEST_FACTOR_RGB;   ///< BlendingFactor::ONE_MINUS_SRC_ALPHA
-extern const BlendingFactor::Type   DEFAULT_BLENDING_SRC_FACTOR_ALPHA;  ///< BlendingFactor::ONE
-extern const BlendingFactor::Type   DEFAULT_BLENDING_DEST_FACTOR_ALPHA; ///< BlendingFactor::ONE_MINUS_SRC_ALPHA
+DALI_IMPORT_API extern const BlendingFactor::Type   DEFAULT_BLENDING_SRC_FACTOR_RGB;    ///< BlendingFactor::SRC_ALPHA
+DALI_IMPORT_API extern const BlendingFactor::Type   DEFAULT_BLENDING_DEST_FACTOR_RGB;   ///< BlendingFactor::ONE_MINUS_SRC_ALPHA
+DALI_IMPORT_API extern const BlendingFactor::Type   DEFAULT_BLENDING_SRC_FACTOR_ALPHA;  ///< BlendingFactor::ONE
+DALI_IMPORT_API extern const BlendingFactor::Type   DEFAULT_BLENDING_DEST_FACTOR_ALPHA; ///< BlendingFactor::ONE_MINUS_SRC_ALPHA
 
-extern const BlendingEquation::Type DEFAULT_BLENDING_EQUATION_RGB;     ///< BlendingEquation::ADD
-extern const BlendingEquation::Type DEFAULT_BLENDING_EQUATION_ALPHA;   ///< BlendingEquation::ADD
+DALI_IMPORT_API extern const BlendingEquation::Type DEFAULT_BLENDING_EQUATION_RGB;     ///< BlendingEquation::ADD
+DALI_IMPORT_API extern const BlendingEquation::Type DEFAULT_BLENDING_EQUATION_ALPHA;   ///< BlendingEquation::ADD
 
 } // namespace Dali
 
diff --git a/dali/public-api/actors/camera-actor.h b/dali/public-api/actors/camera-actor.h
index a73dc45..43d24aa 100644
--- a/dali/public-api/actors/camera-actor.h
+++ b/dali/public-api/actors/camera-actor.h
@@ -20,7 +20,7 @@
 
 #include <dali/public-api/actors/actor.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -66,7 +66,7 @@ enum ProjectionMode
  * in world coordinates.
  *
  */
-class CameraActor : public Actor
+class DALI_IMPORT_API CameraActor : public Actor
 {
 public:
 
diff --git a/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h
index 3792e51..12bad8b 100644
--- a/dali/public-api/actors/custom-actor-impl.h
+++ b/dali/public-api/actors/custom-actor-impl.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/object/property.h>
 #include <dali/public-api/object/ref-object.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
diff --git a/dali/public-api/actors/custom-actor.h b/dali/public-api/actors/custom-actor.h
index a36d62c..12976c1 100644
--- a/dali/public-api/actors/custom-actor.h
+++ b/dali/public-api/actors/custom-actor.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/custom-actor-impl.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
diff --git a/dali/public-api/actors/draw-mode.h b/dali/public-api/actors/draw-mode.h
index 9872e04..8d3db47 100644
--- a/dali/public-api/actors/draw-mode.h
+++ b/dali/public-api/actors/draw-mode.h
@@ -20,7 +20,7 @@
 
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace DrawMode
diff --git a/dali/public-api/actors/image-actor.h b/dali/public-api/actors/image-actor.h
index 49ad858..28dbe06 100644
--- a/dali/public-api/actors/image-actor.h
+++ b/dali/public-api/actors/image-actor.h
@@ -26,7 +26,7 @@
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/images/image.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
diff --git a/dali/public-api/actors/layer.h b/dali/public-api/actors/layer.h
index 8a1199e..9a61203 100644
--- a/dali/public-api/actors/layer.h
+++ b/dali/public-api/actors/layer.h
@@ -25,7 +25,7 @@
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/images/frame-buffer-image.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
diff --git a/dali/public-api/actors/light-actor.h b/dali/public-api/actors/light-actor.h
index 545f193..f54f115 100644
--- a/dali/public-api/actors/light-actor.h
+++ b/dali/public-api/actors/light-actor.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/common/light.h>
 
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
diff --git a/dali/public-api/actors/mesh-actor.h b/dali/public-api/actors/mesh-actor.h
index 2d338cb..a4b1221 100644
--- a/dali/public-api/actors/mesh-actor.h
+++ b/dali/public-api/actors/mesh-actor.h
@@ -22,7 +22,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/renderable-actor.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 class Material;
 class Mesh;
diff --git a/dali/public-api/actors/model-actor-factory.h b/dali/public-api/actors/model-actor-factory.h
index dbc5aef..adb39ab 100644
--- a/dali/public-api/actors/model-actor-factory.h
+++ b/dali/public-api/actors/model-actor-factory.h
@@ -27,7 +27,7 @@
 
 
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Actor;
diff --git a/dali/public-api/actors/renderable-actor.h b/dali/public-api/actors/renderable-actor.h
index a383d22..e2166dd 100644
--- a/dali/public-api/actors/renderable-actor.h
+++ b/dali/public-api/actors/renderable-actor.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/actors/blending.h>
 #include <dali/public-api/actors/sampling.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 namespace Internal DALI_INTERNAL
 {
@@ -313,7 +313,7 @@ public: // Not intended for application developers
  * @param [in] actor root of a tree of actors.
  * @param [in] effect The shader effect.
  */
-void SetShaderEffectRecursively( Actor actor, ShaderEffect effect );
+DALI_IMPORT_API void SetShaderEffectRecursively( Actor actor, ShaderEffect effect );
 
 /**
  * @brief Removes the shader effect from all RenderableActors in a tree of Actors.
@@ -322,7 +322,7 @@ void SetShaderEffectRecursively( Actor actor, ShaderEffect effect );
  *
  * @param [in] actor root of a tree of actors.
  */
-void RemoveShaderEffectRecursively( Actor actor );
+DALI_IMPORT_API void RemoveShaderEffectRecursively( Actor actor );
 
 } // namespace Dali
 
diff --git a/dali/public-api/actors/sampling.h b/dali/public-api/actors/sampling.h
index 222ebe9..b1cc721 100644
--- a/dali/public-api/actors/sampling.h
+++ b/dali/public-api/actors/sampling.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace FilterMode
diff --git a/dali/public-api/actors/text-actor.h b/dali/public-api/actors/text-actor.h
index 4d4a18e..fed6820 100644
--- a/dali/public-api/actors/text-actor.h
+++ b/dali/public-api/actors/text-actor.h
@@ -30,7 +30,7 @@
 #include <dali/public-api/text/text-style.h>
 #include <dali/public-api/text/text.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 struct TextActorParameters;
diff --git a/dali/public-api/common/dali-common.h b/dali/public-api/common/dali-common.h
index 5e756a4..7166cc2 100644
--- a/dali/public-api/common/dali-common.h
+++ b/dali/public-api/common/dali-common.h
@@ -105,7 +105,7 @@ public:
    * @param[in] location  - the location of the assertion
    * @param[in] condition - The assertion condition
    */
-  DALI_IMPORT_API DaliException(const char *location, const char* condition);
+  DaliException(const char *location, const char* condition);
 
   std::string mLocation;  ///< Location in code of the assertion
   std::string mCondition; ///< The assertion string
diff --git a/dali/public-api/common/light.h b/dali/public-api/common/light.h
index 5e2821d..debad5a 100644
--- a/dali/public-api/common/light.h
+++ b/dali/public-api/common/light.h
@@ -28,7 +28,7 @@
 /**
  * The top level DALi namespace
  */
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -52,7 +52,7 @@ enum LightType
 /**
  * @brief Encapsulates the data describing a light source.
  */
-class Light : public BaseHandle
+class DALI_IMPORT_API Light : public BaseHandle
 {
 public:
   /**
diff --git a/dali/public-api/common/loading-state.h b/dali/public-api/common/loading-state.h
index fe859af..dc907c8 100644
--- a/dali/public-api/common/loading-state.h
+++ b/dali/public-api/common/loading-state.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
diff --git a/dali/public-api/common/stage.h b/dali/public-api/common/stage.h
index c456ffa..9884e5d 100644
--- a/dali/public-api/common/stage.h
+++ b/dali/public-api/common/stage.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -47,7 +47,7 @@ struct TouchEvent;
  *
  * Multiple stage/window support is not currently provided.
  */
-class Stage : public BaseHandle
+class DALI_IMPORT_API Stage : public BaseHandle
 {
 public:
 
diff --git a/dali/public-api/dali-core-version.h b/dali/public-api/dali-core-version.h
index 6df6e63..713cce1 100644
--- a/dali/public-api/dali-core-version.h
+++ b/dali/public-api/dali-core-version.h
@@ -18,12 +18,15 @@
  *
  */
 
+// INTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+
 namespace Dali
 {
-extern const unsigned int CORE_MAJOR_VERSION; ///< The major version number of the Core library.
-extern const unsigned int CORE_MINOR_VERSION; ///< The minor version number of the Core library.
-extern const unsigned int CORE_MICRO_VERSION; ///< The micro version number of the Core library.
-extern const char * const CORE_BUILD_DATE;    ///< The date/time the Core library was built.
+DALI_IMPORT_API extern const unsigned int CORE_MAJOR_VERSION; ///< The major version number of the Core library.
+DALI_IMPORT_API extern const unsigned int CORE_MINOR_VERSION; ///< The minor version number of the Core library.
+DALI_IMPORT_API extern const unsigned int CORE_MICRO_VERSION; ///< The micro version number of the Core library.
+DALI_IMPORT_API extern const char * const CORE_BUILD_DATE;    ///< The date/time the Core library was built.
 } // namespace Dali
 
 #endif // __DALI_CORE_VERSION_H__
diff --git a/dali/public-api/dynamics/dynamics-body-config.h b/dali/public-api/dynamics/dynamics-body-config.h
index bc0cf58..5312742 100644
--- a/dali/public-api/dynamics/dynamics-body-config.h
+++ b/dali/public-api/dynamics/dynamics-body-config.h
@@ -27,7 +27,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/dynamics/dynamics-shape.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 class DynamicsWorld;
 struct Vector3;
@@ -42,7 +42,7 @@ class DynamicsBodyConfig;
  *
  * Use to create multiple instances of a DynamicsBody
  */
-class DynamicsBodyConfig : public BaseHandle
+class DALI_IMPORT_API DynamicsBodyConfig : public BaseHandle
 {
 public:
 
diff --git a/dali/public-api/dynamics/dynamics-body.h b/dali/public-api/dynamics/dynamics-body.h
index 0036ca0..485e967 100644
--- a/dali/public-api/dynamics/dynamics-body.h
+++ b/dali/public-api/dynamics/dynamics-body.h
@@ -24,7 +24,7 @@
 // BASE CLASS INCLUDES
 #include <dali/public-api/object/base-handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -42,7 +42,7 @@ class DynamicsWorld;
  *
  * The body is defined with a shape giving it dimension enabling it to collide with other bodies.
  */
-class DynamicsBody : public BaseHandle
+class DALI_IMPORT_API DynamicsBody : public BaseHandle
 {
 public:
   /**
diff --git a/dali/public-api/dynamics/dynamics-collision.h b/dali/public-api/dynamics/dynamics-collision.h
index 560f3e2..e83c465 100644
--- a/dali/public-api/dynamics/dynamics-collision.h
+++ b/dali/public-api/dynamics/dynamics-collision.h
@@ -21,7 +21,7 @@
 // BASE CLASS INCLUDES
 #include <dali/public-api/object/base-handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Actor;
@@ -37,7 +37,7 @@ class DynamicsCollision;
 /**
  * @brief Contains information about a collision between two actors.
  */
-class DynamicsCollision : public BaseHandle
+class DALI_IMPORT_API DynamicsCollision : public BaseHandle
 {
 public:
   /**
diff --git a/dali/public-api/dynamics/dynamics-joint.h b/dali/public-api/dynamics/dynamics-joint.h
index 280a6f7..63d271a 100644
--- a/dali/public-api/dynamics/dynamics-joint.h
+++ b/dali/public-api/dynamics/dynamics-joint.h
@@ -24,7 +24,7 @@
 // BASE CLASS INCLUDES
 #include <dali/public-api/object/base-handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 namespace Internal DALI_INTERNAL
 {
@@ -36,7 +36,7 @@ class Actor;
 /**
  * @brief Represents a connection (or constraint) relationship between two dynamic bodies.
  */
-class DynamicsJoint : public BaseHandle
+class DALI_IMPORT_API DynamicsJoint : public BaseHandle
 {
 public:
   /**
diff --git a/dali/public-api/dynamics/dynamics-shape.h b/dali/public-api/dynamics/dynamics-shape.h
index f74fe72..b080446 100644
--- a/dali/public-api/dynamics/dynamics-shape.h
+++ b/dali/public-api/dynamics/dynamics-shape.h
@@ -25,7 +25,7 @@
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/geometry/cloth.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -38,7 +38,7 @@ class DynamicsWorld;
 /**
  * @brief Defines the shape of an object in the simulation.
  */
-class DynamicsShape : public BaseHandle
+class DALI_IMPORT_API DynamicsShape : public BaseHandle
 {
 public:
   /**
diff --git a/dali/public-api/dynamics/dynamics-world-config.h b/dali/public-api/dynamics/dynamics-world-config.h
index 19acc65..03e64f2 100644
--- a/dali/public-api/dynamics/dynamics-world-config.h
+++ b/dali/public-api/dynamics/dynamics-world-config.h
@@ -24,7 +24,7 @@
 // BASE CLASS INCLUDES
 #include <dali/public-api/object/base-handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 struct Vector3;
@@ -37,7 +37,7 @@ class DynamicsWorldConfig;
 /**
  * @brief Describes the requirements/capabilities of a physics siumlation encapsulated by a DynamicsWorld.
  */
-class DynamicsWorldConfig : public BaseHandle
+class DALI_IMPORT_API DynamicsWorldConfig : public BaseHandle
 {
 public:
   /**
diff --git a/dali/public-api/dynamics/dynamics-world.h b/dali/public-api/dynamics/dynamics-world.h
index 58e0511..183ae55 100644
--- a/dali/public-api/dynamics/dynamics-world.h
+++ b/dali/public-api/dynamics/dynamics-world.h
@@ -27,7 +27,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/signals/dali-signal-v2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -77,7 +77,7 @@ class DynamicsShape;
  * dynamicsRootActor.Add( actor );
  * @endcode
  */
-class DynamicsWorld : public BaseHandle
+class DALI_IMPORT_API DynamicsWorld : public BaseHandle
 {
 public:
 
diff --git a/dali/public-api/events/gesture-detector.h b/dali/public-api/events/gesture-detector.h
index 7360064..7da2730 100644
--- a/dali/public-api/events/gesture-detector.h
+++ b/dali/public-api/events/gesture-detector.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -43,7 +43,7 @@ class Actor;
  *
  * @see Gesture
  */
-class GestureDetector : public Handle
+class DALI_IMPORT_API GestureDetector : public Handle
 {
 public: // Creation & Destruction
 
diff --git a/dali/public-api/events/gesture.h b/dali/public-api/events/gesture.h
index 9fb1681..ee3cef7 100644
--- a/dali/public-api/events/gesture.h
+++ b/dali/public-api/events/gesture.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -38,7 +38,7 @@ namespace Dali DALI_IMPORT_API
  *
  * @note An instance of this class cannot be created.
  */
-struct Gesture
+struct DALI_IMPORT_API Gesture
 {
   /**
    * @brief Copy constructor.
diff --git a/dali/public-api/events/hit-test-algorithm.h b/dali/public-api/events/hit-test-algorithm.h
index ee1c409..fd79c0b 100644
--- a/dali/public-api/events/hit-test-algorithm.h
+++ b/dali/public-api/events/hit-test-algorithm.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/common/stage.h>
 
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class RenderTask;
@@ -142,7 +142,7 @@ typedef bool (*HitTestFunction)(Actor actor, TraverseType type);
  * @param[out] results The results of the hit-test.
  * @param[in] func The function to use in the hit-test algorithm.
  */
-void HitTest( Stage stage, const Vector2& screenCoordinates, Results& results, HitTestFunction func );
+DALI_IMPORT_API void HitTest( Stage stage, const Vector2& screenCoordinates, Results& results, HitTestFunction func );
 
 /**
  * @brief Hit test specific to a given RenderTask.
@@ -152,7 +152,7 @@ void HitTest( Stage stage, const Vector2& screenCoordinates, Results& results, H
  * @param[out] results The results of the hit-test.
  * @param[in] func The function to use in the hit-test algorithm.
  */
-void HitTest( RenderTask& renderTask, const Vector2& screenCoordinates, Results& results, HitTestFunction func );
+DALI_IMPORT_API void HitTest( RenderTask& renderTask, const Vector2& screenCoordinates, Results& results, HitTestFunction func );
 
 } // namespace HitTestAlgorithm
 
diff --git a/dali/public-api/events/hover-event.h b/dali/public-api/events/hover-event.h
index bc5d8f7..44e486e 100644
--- a/dali/public-api/events/hover-event.h
+++ b/dali/public-api/events/hover-event.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/touch-point.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
diff --git a/dali/public-api/events/key-event.h b/dali/public-api/events/key-event.h
index 942f944..4458c68 100644
--- a/dali/public-api/events/key-event.h
+++ b/dali/public-api/events/key-event.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -41,7 +41,7 @@ namespace Dali DALI_IMPORT_API
  * IMF keyboard to Core. In future IMF may communicate via its own
  * module.
  */
-struct KeyEvent
+struct DALI_IMPORT_API KeyEvent
 {
   // Enumerations
 
diff --git a/dali/public-api/events/long-press-gesture-detector.h b/dali/public-api/events/long-press-gesture-detector.h
index dcabb10..c94de17 100644
--- a/dali/public-api/events/long-press-gesture-detector.h
+++ b/dali/public-api/events/long-press-gesture-detector.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/events/gesture-detector.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -49,7 +49,7 @@ struct LongPressGesture;
  *
  * @see LongPressGesture
  */
-class LongPressGestureDetector : public GestureDetector
+class DALI_IMPORT_API LongPressGestureDetector : public GestureDetector
 {
 public: // Typedefs
 
diff --git a/dali/public-api/events/long-press-gesture.h b/dali/public-api/events/long-press-gesture.h
index 7258f0a..a85ce08 100644
--- a/dali/public-api/events/long-press-gesture.h
+++ b/dali/public-api/events/long-press-gesture.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/math/vector2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -35,7 +35,7 @@ namespace Dali DALI_IMPORT_API
  *
  * @see LongPressGestureDetector
  */
-struct LongPressGesture : public Gesture
+struct DALI_IMPORT_API LongPressGesture : public Gesture
 {
   // Construction & Destruction
 
diff --git a/dali/public-api/events/mouse-wheel-event.h b/dali/public-api/events/mouse-wheel-event.h
index c7ede28..121fbe7 100644
--- a/dali/public-api/events/mouse-wheel-event.h
+++ b/dali/public-api/events/mouse-wheel-event.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/math/vector2.h>
 
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -33,7 +33,7 @@ namespace Dali DALI_IMPORT_API
  * There is a key modifier which relates to keys like alt, shift and control functions are
  * supplied to check if they have been pressed when the mouse wheel is being rolled.
  */
-struct MouseWheelEvent
+struct DALI_IMPORT_API MouseWheelEvent
 {
   /**
    * @brief Default constructor.
diff --git a/dali/public-api/events/pan-gesture-detector.h b/dali/public-api/events/pan-gesture-detector.h
index 734dc41..44c33f8 100644
--- a/dali/public-api/events/pan-gesture-detector.h
+++ b/dali/public-api/events/pan-gesture-detector.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/events/gesture-detector.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 struct Radian;
@@ -51,7 +51,7 @@ struct PanGesture;
  *
  * @see PanGesture
  */
-class PanGestureDetector : public GestureDetector
+class DALI_IMPORT_API PanGestureDetector : public GestureDetector
 {
 public:
 
diff --git a/dali/public-api/events/pan-gesture.h b/dali/public-api/events/pan-gesture.h
index 436a0f7..5be62b7 100644
--- a/dali/public-api/events/pan-gesture.h
+++ b/dali/public-api/events/pan-gesture.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/math/vector2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -40,7 +40,7 @@ namespace Dali DALI_IMPORT_API
  *
  * A pan gesture will continue to be sent to the actor under than initial pan until it ends.
  */
-struct PanGesture: public Gesture
+struct DALI_IMPORT_API PanGesture: public Gesture
 {
   // Construction & Destruction
 
diff --git a/dali/public-api/events/pinch-gesture-detector.h b/dali/public-api/events/pinch-gesture-detector.h
index 5a24f34..c554289 100644
--- a/dali/public-api/events/pinch-gesture-detector.h
+++ b/dali/public-api/events/pinch-gesture-detector.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/events/gesture-detector.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -48,7 +48,7 @@ struct PinchGesture;
  *
  * @see PinchGesture
  */
-class PinchGestureDetector : public GestureDetector
+class DALI_IMPORT_API PinchGestureDetector : public GestureDetector
 {
 public: // Typedefs
 
diff --git a/dali/public-api/events/pinch-gesture.h b/dali/public-api/events/pinch-gesture.h
index 0953fe8..c1de57f 100644
--- a/dali/public-api/events/pinch-gesture.h
+++ b/dali/public-api/events/pinch-gesture.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/math/vector2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -36,7 +36,7 @@ namespace Dali DALI_IMPORT_API
  * A pinch gesture will continue to be sent to the actor under the center point of the pinch
  * until the pinch ends.
  */
-struct PinchGesture: public Gesture
+struct DALI_IMPORT_API PinchGesture: public Gesture
 {
   // Construction & Destruction
 
diff --git a/dali/public-api/events/tap-gesture-detector.h b/dali/public-api/events/tap-gesture-detector.h
index f809d80..c1bd351 100644
--- a/dali/public-api/events/tap-gesture-detector.h
+++ b/dali/public-api/events/tap-gesture-detector.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/events/gesture-detector.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -50,7 +50,7 @@ struct TapGesture;
  *
  * @see TapGesture
  */
-class TapGestureDetector : public GestureDetector
+class DALI_IMPORT_API TapGestureDetector : public GestureDetector
 {
 public: // Typedefs
 
diff --git a/dali/public-api/events/tap-gesture.h b/dali/public-api/events/tap-gesture.h
index e8c89c8..60af6f7 100644
--- a/dali/public-api/events/tap-gesture.h
+++ b/dali/public-api/events/tap-gesture.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/math/vector2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -31,7 +31,7 @@ namespace Dali DALI_IMPORT_API
  * This is a discrete gesture so does not have any state information.
  * @see TapGestureDetector
  */
-struct TapGesture : public Gesture
+struct DALI_IMPORT_API TapGesture : public Gesture
 {
   // Construction & Destruction
 
diff --git a/dali/public-api/events/touch-event.h b/dali/public-api/events/touch-event.h
index d1eebc5..6793088 100644
--- a/dali/public-api/events/touch-event.h
+++ b/dali/public-api/events/touch-event.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/touch-point.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 /**
  * @brief Touch events are a collection of touch points at a specific moment in time.
diff --git a/dali/public-api/events/touch-point.h b/dali/public-api/events/touch-point.h
index 12cafb8..0b071a1 100644
--- a/dali/public-api/events/touch-point.h
+++ b/dali/public-api/events/touch-point.h
@@ -22,14 +22,14 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/math/vector2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
  * @brief A TouchPoint represents a point on the screen that is currently being touched
  * or where touch has stopped.
  */
-struct TouchPoint
+struct DALI_IMPORT_API TouchPoint
 {
   // Enumerations
 
diff --git a/dali/public-api/geometry/animatable-mesh.h b/dali/public-api/geometry/animatable-mesh.h
index ff898ef..6c3394a 100644
--- a/dali/public-api/geometry/animatable-mesh.h
+++ b/dali/public-api/geometry/animatable-mesh.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/geometry/animatable-vertex.h>
 #include <dali/public-api/modeling/material.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 class AnimatableVertex;
 
@@ -40,7 +40,7 @@ class AnimatableMesh;
  * It is recommended that the vertices of the mesh remain in the bounds -0.5 - 0.5, which
  * will match the actor size boundaries. The origin of the mesh matches the actor's position.
  */
-class AnimatableMesh : public Constrainable
+class DALI_IMPORT_API AnimatableMesh : public Constrainable
 {
 public:
   /**
diff --git a/dali/public-api/geometry/animatable-vertex.h b/dali/public-api/geometry/animatable-vertex.h
index 21ba4cd..f955c28 100644
--- a/dali/public-api/geometry/animatable-vertex.h
+++ b/dali/public-api/geometry/animatable-vertex.h
@@ -25,7 +25,7 @@
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/math/vector4.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 class AnimatableMesh;
 
@@ -45,7 +45,7 @@ class AnimatableMesh;
  * mesh[vertex].SetColor(color);
  * @endcode
  */
-class AnimatableVertex
+class DALI_IMPORT_API AnimatableVertex
 {
 public:
 
diff --git a/dali/public-api/geometry/cloth.h b/dali/public-api/geometry/cloth.h
index a3536ae..80009b1 100644
--- a/dali/public-api/geometry/cloth.h
+++ b/dali/public-api/geometry/cloth.h
@@ -25,7 +25,7 @@
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/geometry/mesh.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -37,7 +37,7 @@ class Cloth;
  * @brief A Cloth is a specialized mesh that can be used and modified
  * by the Dynamics engine.
  */
-class Cloth : public Mesh
+class DALI_IMPORT_API Cloth : public Mesh
 {
 public:
 
diff --git a/dali/public-api/geometry/mesh-data.h b/dali/public-api/geometry/mesh-data.h
index 3752932..dbbb4a5 100644
--- a/dali/public-api/geometry/mesh-data.h
+++ b/dali/public-api/geometry/mesh-data.h
@@ -29,7 +29,7 @@
 // DECLARATION FILES
 
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 class Matrix;
 
@@ -68,7 +68,7 @@ class Matrix;
  * The mesh vertex shader then applies up to 4 weighted transforms to each
  * vertex and vertex normal.
  */
-class MeshData
+class DALI_IMPORT_API MeshData
 {
 public:
   static const unsigned int MAX_NUMBER_OF_BONES = 12; ///< Maximum number of bones that can affect this mesh.
diff --git a/dali/public-api/geometry/mesh-factory.h b/dali/public-api/geometry/mesh-factory.h
index 7f9c09f..2a57ee4 100644
--- a/dali/public-api/geometry/mesh-factory.h
+++ b/dali/public-api/geometry/mesh-factory.h
@@ -36,11 +36,11 @@ namespace MeshFactory
  * @param[in] textureCoordinates  UV coordinates.
  * @return A mesh data structure containing the plane mesh
  */
-Dali::MeshData NewPlane( const float width,
-                         const float height,
-                         const int xSteps,
-                         const int ySteps,
-                         const Rect<float>& textureCoordinates = Rect<float>(0.0f, 0.0f, 1.0f, 1.0f) );
+DALI_IMPORT_API Dali::MeshData NewPlane( const float width,
+                                         const float height,
+                                         const int xSteps,
+                                         const int ySteps,
+                                         const Rect<float>& textureCoordinates = Rect<float>(0.0f, 0.0f, 1.0f, 1.0f) );
 
 } // MeshFactory
 } // Dali
diff --git a/dali/public-api/geometry/mesh.h b/dali/public-api/geometry/mesh.h
index 6eb0ebd..c14f9c3 100644
--- a/dali/public-api/geometry/mesh.h
+++ b/dali/public-api/geometry/mesh.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/object/base-handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -37,7 +37,7 @@ class Mesh;
  *
  * It is used to tell the Scene Graph if the mesh data has changed.
  */
-class Mesh : public BaseHandle
+class DALI_IMPORT_API Mesh : public BaseHandle
 {
 public:
 
diff --git a/dali/public-api/geometry/spline.h b/dali/public-api/geometry/spline.h
index c70dbbe..279c9fa 100644
--- a/dali/public-api/geometry/spline.h
+++ b/dali/public-api/geometry/spline.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/math/matrix.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Matrix;
@@ -47,7 +47,7 @@ struct Vector3;
  * be chosen carefully. (Most useful for animation curves)
  *
  */
-class Spline
+class DALI_IMPORT_API Spline
 {
 public:
   /**
diff --git a/dali/public-api/images/bitmap-image.h b/dali/public-api/images/bitmap-image.h
index c42bc37..331afe6 100644
--- a/dali/public-api/images/bitmap-image.h
+++ b/dali/public-api/images/bitmap-image.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/math/rect.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -62,7 +62,7 @@ typedef Rect<unsigned int>    RectArea;     ///< rectangular area (x,y,w,h)
  * If the image is opaque and blending is not required, then the user
  * should call ImageActor::SetUseImageAlpha(false) on the containing actor.
  */
-class BitmapImage : public Image
+class DALI_IMPORT_API BitmapImage : public Image
 {
 public:
   /**
diff --git a/dali/public-api/images/distance-field.h b/dali/public-api/images/distance-field.h
index 0dd2714..532c752 100644
--- a/dali/public-api/images/distance-field.h
+++ b/dali/public-api/images/distance-field.h
@@ -22,7 +22,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 struct Vector2;
@@ -39,11 +39,11 @@ struct Vector2;
  * @param[in]  maxSize         The image is scaled from this size to distanceMapSize
  * @param[in]  highQuality     Set true to generate high quality distance fields
  */
-void GenerateDistanceFieldMap(const unsigned char* const imagePixels, const Vector2& imageSize,
-                              unsigned char* const distanceMap, const Vector2& distanceMapSize,
-                              const unsigned int fieldBorder,
-                              const Vector2& maxSize,
-                              bool highQuality = true);
+DALI_IMPORT_API void GenerateDistanceFieldMap( const unsigned char* const imagePixels, const Vector2& imageSize,
+                                               unsigned char* const distanceMap, const Vector2& distanceMapSize,
+                                               const unsigned int fieldBorder,
+                                               const Vector2& maxSize,
+                                               bool highQuality = true);
 
 } //namespace Dali
 
diff --git a/dali/public-api/images/encoded-buffer-image.h b/dali/public-api/images/encoded-buffer-image.h
index a5dceee..e1f8301 100644
--- a/dali/public-api/images/encoded-buffer-image.h
+++ b/dali/public-api/images/encoded-buffer-image.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -58,7 +58,7 @@ class EncodedBufferImage;
  * Image::UploadedSignal is emitted when the decoded image data gets
  * uploaded to the OpenGL ES implementation.
  */
-class EncodedBufferImage : public Image
+class DALI_IMPORT_API EncodedBufferImage : public Image
 {
 public:
   /**
diff --git a/dali/public-api/images/frame-buffer-image.h b/dali/public-api/images/frame-buffer-image.h
index 95b1dee..0aad737 100644
--- a/dali/public-api/images/frame-buffer-image.h
+++ b/dali/public-api/images/frame-buffer-image.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/math/rect.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -36,7 +36,7 @@ class FrameBufferImage;
  * The FrameBufferImage can then be used with an ImageActor (with optional shader
  * effects) and rendered to the screen.
  */
-class FrameBufferImage : public Image
+class DALI_IMPORT_API FrameBufferImage : public Image
 {
 public:
   /**
diff --git a/dali/public-api/images/glyph-image.h b/dali/public-api/images/glyph-image.h
index 2b38f3d..df2d33d 100644
--- a/dali/public-api/images/glyph-image.h
+++ b/dali/public-api/images/glyph-image.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/text/font.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Character;
@@ -31,7 +31,7 @@ class TextStyle;
 /**
  * @brief A GlyphImage object is an image resource which represents a character.
  */
-class GlyphImage : public Image
+class DALI_IMPORT_API GlyphImage : public Image
 {
 public:
   /**
diff --git a/dali/public-api/images/image-attributes.h b/dali/public-api/images/image-attributes.h
index 3714d8f..3563be1 100644
--- a/dali/public-api/images/image-attributes.h
+++ b/dali/public-api/images/image-attributes.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/math/vector2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class ImageAttributes;
@@ -63,7 +63,7 @@ class ImageAttributes;
  *
  * @note The aspect ratio of image contents is preserved by all scaling modes, so for example squares in input images stay square after loading.
  */
-class ImageAttributes
+class DALI_IMPORT_API ImageAttributes
 {
 public:
 
@@ -303,7 +303,7 @@ private:
  * @param [in] b parameter tested
  * @return true if a is less than b
  */
-bool operator<(const ImageAttributes& a, const ImageAttributes& b);
+DALI_IMPORT_API bool operator<(const ImageAttributes& a, const ImageAttributes& b);
 
 /**
  * @brief Equal to comparison operator.
@@ -312,7 +312,7 @@ bool operator<(const ImageAttributes& a, const ImageAttributes& b);
  * @param [in] b parameter tested for equality
  * @return true if a is equal to b
  */
-bool operator==(const ImageAttributes& a, const ImageAttributes& b);
+DALI_IMPORT_API bool operator==(const ImageAttributes& a, const ImageAttributes& b);
 
 /**
  * @brief Not equal to comparison operator.
@@ -321,7 +321,7 @@ bool operator==(const ImageAttributes& a, const ImageAttributes& b);
  * @param [in] b parameter tested for equality
  * @return true if a is not equal to b
  */
-bool operator!=(const ImageAttributes& a, const ImageAttributes& b);
+DALI_IMPORT_API bool operator!=(const ImageAttributes& a, const ImageAttributes& b);
 
 } // namespace Dali
 
diff --git a/dali/public-api/images/image.h b/dali/public-api/images/image.h
index 4aa03e0..91cd805 100644
--- a/dali/public-api/images/image.h
+++ b/dali/public-api/images/image.h
@@ -27,7 +27,7 @@
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 struct Vector2;
 
@@ -95,7 +95,7 @@ class ImageAttributes;
  * Note: if a resource was shared between Image objects it exists until its last reference is gone.
  *
  */
-class Image : public BaseHandle
+class DALI_IMPORT_API Image : public BaseHandle
 {
 public:
   /**
diff --git a/dali/public-api/images/native-image.h b/dali/public-api/images/native-image.h
index 9723201..550489f 100644
--- a/dali/public-api/images/native-image.h
+++ b/dali/public-api/images/native-image.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/images/pixel.h>
 #include <dali/public-api/object/ref-object.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -98,6 +98,7 @@ protected:
   virtual ~NativeImage()
   {
   }
+
 };
 
 /**
diff --git a/dali/public-api/images/nine-patch-image.h b/dali/public-api/images/nine-patch-image.h
index 39c515e..dc953b7 100644
--- a/dali/public-api/images/nine-patch-image.h
+++ b/dali/public-api/images/nine-patch-image.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/images/bitmap-image.h>
 #include <dali/public-api/math/rect.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -47,7 +47,7 @@ class NinePatchImage;
  * to use the cropped BitmapImage - if you don't retain a handle to this object, it will
  * be automatically destroyed.
  */
-class NinePatchImage : public Image
+class DALI_IMPORT_API NinePatchImage : public Image
 {
 public:
   /**
diff --git a/dali/public-api/images/pixel.h b/dali/public-api/images/pixel.h
index 46320b5..907c3cc 100644
--- a/dali/public-api/images/pixel.h
+++ b/dali/public-api/images/pixel.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -88,7 +88,7 @@ const Format LAST_VALID_PIXEL_FORMAT = COMPRESSED_RGB_PVRTC_4BPPV1;
  * @param [in] pixelformat pixel format
  * @return true if format has alpha, false otherwise
  */
-bool HasAlpha(Format pixelformat);
+DALI_IMPORT_API bool HasAlpha(Format pixelformat);
 
 /**
  * @brief Returns The number of bytes per pixel for the specified pixel format.
@@ -96,7 +96,7 @@ bool HasAlpha(Format pixelformat);
  * @param [in] pixelFormat The pixel format
  * @return The number of bytes per pixel
  */
-unsigned int GetBytesPerPixel(Format pixelFormat);
+DALI_IMPORT_API unsigned int GetBytesPerPixel(Format pixelFormat);
 
 /**
  * @brief Returns the offset of the byte containing the alpha mask from the start of the pixel data
@@ -107,7 +107,7 @@ unsigned int GetBytesPerPixel(Format pixelFormat);
  * @param[out] byteOffset the byte offset
  * @param[out] bitMask the bitmask
  */
-void GetAlphaOffsetAndMask(Format pixelFormat, int& byteOffset, int& bitMask);
+DALI_IMPORT_API void GetAlphaOffsetAndMask(Format pixelFormat, int& byteOffset, int& bitMask);
 
 } //namespace Pixel
 
diff --git a/dali/public-api/modeling/bone.h b/dali/public-api/modeling/bone.h
index f4b7ace..7db2189 100644
--- a/dali/public-api/modeling/bone.h
+++ b/dali/public-api/modeling/bone.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/math/matrix.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Matrix;
@@ -39,7 +39,7 @@ typedef BoneContainer::const_iterator BoneConstIter; ///< @ref Dali::BoneContain
  * A Bone is a named actor that can be used to deform a mesh. @see Dali::MeshData for more
  * information.
  */
-class Bone
+class DALI_IMPORT_API Bone
 {
 public:
   /**
diff --git a/dali/public-api/modeling/entity-animator-map.h b/dali/public-api/modeling/entity-animator-map.h
index ee36850..a12597e 100644
--- a/dali/public-api/modeling/entity-animator-map.h
+++ b/dali/public-api/modeling/entity-animator-map.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/animation/key-frames.h>
 #include <dali/public-api/modeling/entity.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Entity;
@@ -37,7 +37,7 @@ typedef EntityAnimatorMapContainer::const_iterator EntityAnimatorMapIter; ///< I
  * @brief The entity animator map class is a mapping from an entity name to raw animation
  * data for that entity, stored in 3 KeyFrames for position, scale and rotation.
  */
-class EntityAnimatorMap
+class DALI_IMPORT_API EntityAnimatorMap
 {
 public:
   /**
diff --git a/dali/public-api/modeling/entity.h b/dali/public-api/modeling/entity.h
index 50b4111..498b6e6 100644
--- a/dali/public-api/modeling/entity.h
+++ b/dali/public-api/modeling/entity.h
@@ -22,7 +22,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/geometry/mesh.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Entity;
@@ -48,7 +48,7 @@ typedef std::vector<unsigned int>       EntityMeshIndices;  ///< Container to ho
  * It can contain zero or more meshes.  The entity names are used for
  * cross referencing, e.g. from animations or from bone structures.
  */
-class Entity : public BaseHandle
+class DALI_IMPORT_API Entity : public BaseHandle
 {
 public:
 
diff --git a/dali/public-api/modeling/material.h b/dali/public-api/modeling/material.h
index ce5db99..c2db488 100644
--- a/dali/public-api/modeling/material.h
+++ b/dali/public-api/modeling/material.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/common/constants.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 struct Vector4;
@@ -43,7 +43,7 @@ typedef MaterialContainer::const_iterator MaterialConstIter; ///< Const iterator
  *
  * Color, opacity, shininess, shading mode, texture/normal/height mapping...
  */
-class Material : public BaseHandle
+class DALI_IMPORT_API Material : public BaseHandle
 {
 public:
   /**
diff --git a/dali/public-api/modeling/model-animation-map.h b/dali/public-api/modeling/model-animation-map.h
index 87cf3f3..f7628e3 100644
--- a/dali/public-api/modeling/model-animation-map.h
+++ b/dali/public-api/modeling/model-animation-map.h
@@ -22,7 +22,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/modeling/entity-animator-map.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 struct ModelAnimationMap;
diff --git a/dali/public-api/modeling/model-data.h b/dali/public-api/modeling/model-data.h
index d9ff110..8a89833 100644
--- a/dali/public-api/modeling/model-data.h
+++ b/dali/public-api/modeling/model-data.h
@@ -26,7 +26,7 @@
 #include <dali/public-api/modeling/model-animation-map.h>
 #include <dali/public-api/object/base-handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Entity;
@@ -45,7 +45,7 @@ class ModelData;
  * This is usually generated by an external model loader (and is also
  * used internally with the default model loader).
  */
-class ModelData : public BaseHandle
+class DALI_IMPORT_API ModelData : public BaseHandle
 {
 public:
 
diff --git a/dali/public-api/modeling/model.h b/dali/public-api/modeling/model.h
index 980cc5b..43de898 100644
--- a/dali/public-api/modeling/model.h
+++ b/dali/public-api/modeling/model.h
@@ -28,7 +28,7 @@
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class MeshActor;
@@ -45,7 +45,7 @@ class Model;
  * Use ModelActorFactory::BuildActorTree() to create actors from this model.
  * Use ModelActorFactory::BuildAnimation() to create animations on such actors.
  */
-class Model : public BaseHandle
+class DALI_IMPORT_API Model : public BaseHandle
 {
 public:
 
diff --git a/dali/public-api/object/constrainable.h b/dali/public-api/object/constrainable.h
index 1d695d5..2e33f2d 100644
--- a/dali/public-api/object/constrainable.h
+++ b/dali/public-api/object/constrainable.h
@@ -162,14 +162,14 @@ public:
 namespace WeightObject
 {
 
-extern const Property::Index WEIGHT; ///< name "weight", type FLOAT
+DALI_IMPORT_API extern const Property::Index WEIGHT; ///< name "weight", type FLOAT
 
 /**
  * @brief Convenience function to create an object with a custom "weight" property.
  *
  * @return A handle to a newly allocated object.
  */
-Constrainable New();
+DALI_IMPORT_API Constrainable New();
 
 } // namespace WeightObject
 
diff --git a/dali/public-api/render-tasks/render-task-list.h b/dali/public-api/render-tasks/render-task-list.h
index cb18112..35b77d8 100644
--- a/dali/public-api/render-tasks/render-task-list.h
+++ b/dali/public-api/render-tasks/render-task-list.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class RenderTask;
@@ -37,7 +37,7 @@ class RenderTaskList;
  *
  * These tasks describe how the Dali scene should be rendered; @see Dali::RenderTask for more details.
  */
-class RenderTaskList : public BaseHandle
+class DALI_IMPORT_API RenderTaskList : public BaseHandle
 {
 public:
 
diff --git a/dali/public-api/render-tasks/render-task.h b/dali/public-api/render-tasks/render-task.h
index 178c6ab..cdc989d 100644
--- a/dali/public-api/render-tasks/render-task.h
+++ b/dali/public-api/render-tasks/render-task.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/object/constrainable.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Actor;
@@ -69,7 +69,7 @@ class RenderTask;
  * Note that all connected signals must be disconnected before the object is destroyed. This is typically done in the
  * object destructor, and requires either the Dali::Connection object or Dali::RenderTask handle to be stored.
  */
-class RenderTask : public Constrainable
+class DALI_IMPORT_API RenderTask : public Constrainable
 {
 public:
   /**
diff --git a/dali/public-api/shader-effects/shader-effect.h b/dali/public-api/shader-effects/shader-effect.h
index 6dbdc2a..f61f47d 100644
--- a/dali/public-api/shader-effects/shader-effect.h
+++ b/dali/public-api/shader-effects/shader-effect.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/animation/active-constraint-declarations.h>
 #include <dali/public-api/object/constrainable.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -147,7 +147,7 @@ enum GeometryType
  * with the uniform color "uColor" of the node
  * </B>
  */
-class ShaderEffect : public Constrainable
+class DALI_IMPORT_API ShaderEffect : public Constrainable
 {
 public:
   /**
diff --git a/dali/public-api/text/character.h b/dali/public-api/text/character.h
index e7c1b65..6bfe058 100644
--- a/dali/public-api/text/character.h
+++ b/dali/public-api/text/character.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -35,7 +35,7 @@ namespace Internal DALI_INTERNAL
  * This class is provided for convenience. A user can't instantiate Characters directly.
  * However, by instantiating a Text object, Characters are returned by Text::operator[].
  */
-class Character
+class DALI_IMPORT_API Character
 {
 public:
 
diff --git a/dali/public-api/text/font-parameters.h b/dali/public-api/text/font-parameters.h
index 968d741..2fa4087 100644
--- a/dali/public-api/text/font-parameters.h
+++ b/dali/public-api/text/font-parameters.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/text/text.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 /**
@@ -30,7 +30,7 @@ namespace Dali DALI_IMPORT_API
  *
  * This reduces ambiguity when using methods which accept size in pixels or points.
  */
-struct PointSize
+struct DALI_IMPORT_API PointSize
 {
   /**
    * @brief Create size in points.
@@ -68,7 +68,7 @@ struct PointSize
  *
  * This reduces ambiguity when using methods which accept size in pixels or points.
  */
-struct PixelSize
+struct DALI_IMPORT_API PixelSize
 {
   /**
    * @brief Create size in pixels.
@@ -88,7 +88,7 @@ struct PixelSize
 /**
  * @brief Font size in Caps height
  */
-struct CapsHeight
+struct DALI_IMPORT_API CapsHeight
 {
   /**
    * @brief Size in CapsHeight
@@ -106,7 +106,7 @@ struct CapsHeight
 /**
  * @brief Encapsulates all font parameters.
  */
-struct FontParameters
+struct DALI_IMPORT_API FontParameters
 {
   /**
    * @brief Default constructor.
@@ -196,7 +196,7 @@ private:
 
 };
 
-extern FontParameters DEFAULT_FONT_PARAMETERS; ///< Used to choose the platform's font parameters
+DALI_IMPORT_API extern FontParameters DEFAULT_FONT_PARAMETERS; ///< Used to choose the platform's font parameters
 
 } // namespace Dali
 
diff --git a/dali/public-api/text/font.h b/dali/public-api/text/font.h
index b630013..8861eda 100644
--- a/dali/public-api/text/font.h
+++ b/dali/public-api/text/font.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/text/font-parameters.h>
 #include <dali/public-api/text/text.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 struct Vector3;
@@ -43,7 +43,7 @@ class Font;
  *
  * Fonts will be created from a font name (like courier or comic) and font size (specified in points).
  */
-class Font : public BaseHandle
+class DALI_IMPORT_API Font : public BaseHandle
 {
 public:
   /**
diff --git a/dali/public-api/text/text-actor-parameters.h b/dali/public-api/text/text-actor-parameters.h
index 4e1e51d..42b4fb5 100644
--- a/dali/public-api/text/text-actor-parameters.h
+++ b/dali/public-api/text/text-actor-parameters.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 // Forward declarations
@@ -30,7 +30,7 @@ class TextStyle;
 /**
  * @brief Encapsulates text-actor parameters.
  */
-struct TextActorParameters
+struct DALI_IMPORT_API TextActorParameters
 {
   /**
    * @brief Enumeration of the automatic font detection medes.
@@ -98,7 +98,7 @@ private:
   Impl* mImpl;
 };
 
-extern TextActorParameters DEFAULT_TEXT_ACTOR_PARAMETERS; ///< By default the text style is the default one and the automatic font detection is enabled.
+DALI_IMPORT_API extern TextActorParameters DEFAULT_TEXT_ACTOR_PARAMETERS; ///< By default the text style is the default one and the automatic font detection is enabled.
 
 } // namespace Dali
 
diff --git a/dali/public-api/text/text.h b/dali/public-api/text/text.h
index 31c5ace..32490bf 100644
--- a/dali/public-api/text/text.h
+++ b/dali/public-api/text/text.h
@@ -26,7 +26,7 @@
 #include <dali/public-api/text/character.h>
 #include <dali/public-api/common/dali-vector.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -37,7 +37,7 @@ namespace Internal DALI_INTERNAL
 /**
  * @brief Encapsulates a string of characters implementation to support multiple languages.
  */
-class Text
+class DALI_IMPORT_API Text
 {
 
 public:
diff --git a/dali/public-api/text/utf8.h b/dali/public-api/text/utf8.h
index 38b213c..0183a90 100644
--- a/dali/public-api/text/utf8.h
+++ b/dali/public-api/text/utf8.h
@@ -21,7 +21,7 @@
 
 #include <dali/public-api/common/dali-common.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 /**
  * @brief Determine the length (in bytes) of a UTF-8 character.