diff --git a/include/osg/Math b/include/osg/Math
index 78a04787a..d1c8a8880 100644
--- a/include/osg/Math
+++ b/include/osg/Math
@@ -25,7 +25,6 @@
     #include <float.h>
 #endif
 
-
 #if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
     defined (sun) || \
     defined (__APPLE__)
@@ -39,39 +38,39 @@
     // where they arent in math.h
 
     #ifndef acosf
-    #define acosf (float)acos
+    inline float acosf(float value) { return static_cast<float>(acos(value)); }
     #endif
 
     #ifndef asinf
-    #define asinf (float)asin
+    inline float asinf(float value) { return static_cast<float>(asin(value)); }
     #endif
 
     #ifndef cosf
-    #define cosf (float)cos
+    inline float cosf(float value) { return static_cast<float>(cos(value)); }
     #endif
 
     #ifndef sinf
-    #define sinf (float)sin
+    inline float sinf(float value) { return static_cast<float>(sin(value)); }
     #endif
 
     #ifndef logf
-    #define logf (float)log
+    inline float logf(float value) { return static_cast<float>(log(value)); }
     #endif
 
     #ifndef powf
-    #define powf (float)pow
+    inline float powf(float value1,float value2) { return static_cast<float>(pow(value1,value2)); }
     #endif
 
     #ifndef sqrtf
-    #define sqrtf (float)sqrt
+    inline float sqrtf(float value) { return static_cast<float>(sqrt(value)); }
     #endif
     
     #ifndef fabsf
-    #define fabsf (float)fabs
+    inline float fabsf(float value) { return static_cast<float>(fabs(value)); }
     #endif
 
     #ifndef atan2f
-    #define atan2f (float)atan2
+    inline float atan2f(float value1, float value2) { return static_cast<float>(atan2(value1,value2)); }
     #endif
 
 #endif
@@ -80,7 +79,7 @@
     defined (sun)
 
     #ifndef isnanf
-    #define isnanf (float)isnan
+    inline int isnanf(float value) { return isnan(value); }
     #endif
 
 #endif
@@ -91,7 +90,7 @@
     defined (APPLE_PRE_10_2)
 
     #ifndef floorf
-    #define floorf (float)floor
+    inline float floorf(float value) { return static_cast<float>(floor(value)); }
     #endif
 
 #endif
diff --git a/include/osgSim/ImpostorSprite b/include/osgSim/ImpostorSprite
index 9cf02990b..91e97ff87 100644
--- a/include/osgSim/ImpostorSprite
+++ b/include/osgSim/ImpostorSprite
@@ -152,7 +152,7 @@ class OSGSIM_EXPORT ImpostorSprite : public osg::Drawable
 
     protected:
 
-        ImpostorSprite(const ImpostorSprite&):Drawable() {}
+        ImpostorSprite(const ImpostorSprite&);
         ImpostorSprite& operator = (const ImpostorSprite&) { return *this;}
 
         virtual ~ImpostorSprite();
diff --git a/src/osgFX/MultiTextureControl.cpp b/src/osgFX/MultiTextureControl.cpp
index fb273043e..8f6fdb0ea 100644
--- a/src/osgFX/MultiTextureControl.cpp
+++ b/src/osgFX/MultiTextureControl.cpp
@@ -16,6 +16,7 @@
 
 #include <osgFX/MultiTextureControl>
 
+using namespace osg;
 using namespace osgFX;
 
 MultiTextureControl::MultiTextureControl()
diff --git a/src/osgSim/ImpostorSprite.cpp b/src/osgSim/ImpostorSprite.cpp
index fed7c2cde..8201679eb 100644
--- a/src/osgSim/ImpostorSprite.cpp
+++ b/src/osgSim/ImpostorSprite.cpp
@@ -26,6 +26,7 @@
 
 #include <osgSim/ImpostorSprite>
 
+using namespace osg;
 using namespace osgSim;
 
 ImpostorSprite::ImpostorSprite()
@@ -45,6 +46,9 @@ ImpostorSprite::ImpostorSprite()
     _color.set(1.0f, 1.0f, 1.0f, 1.0f );
 }
 
+ImpostorSprite::ImpostorSprite(const ImpostorSprite&): Drawable() {}
+
+
 ImpostorSprite::~ImpostorSprite()
 {
     if (_ism)
diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp
index 68e0f03b5..ed853a8fb 100644
--- a/src/osgText/Text.cpp
+++ b/src/osgText/Text.cpp
@@ -23,11 +23,11 @@
 
 #include "DefaultFont.h"
 
+using namespace osg;
 using namespace osgText;
 
 //#define TREES_CODE_FOR_MAKING_SPACES_EDITABLE
 
-
 Text::Text():
     _fontWidth(32),
     _fontHeight(32),