diff --git a/adobe/cmath.hpp b/adobe/cmath.hpp
index 733c299..e671f7c 100644
--- a/adobe/cmath.hpp
+++ b/adobe/cmath.hpp
@@ -37,18 +37,9 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
 #define ADOBE_HAS_CPP_CMATH 
 
 #elif __GNUC__ == 4 
-#if (__GNUC_MINOR__ <= 7) || (!(defined(_GLIBCXX_USE_C99_MATH_TR1)))
-// at least Ubuntu 9.x, gcc 4.4.1, still falls into this case
-/*
-    The currently supported version of GNUC has C99 extensions in math.h. But no TR1 extensions.
-*/
-#define ADOBE_HAS_C99_MATH_H
-#include <cmath>
-#else 
-#include <tr1/cmath>
 
 #define ADOBE_HAS_C99_STD_MATH_H
-#endif
+#include <tr1/cmath>
 #endif
 
 #elif defined(_MSC_VER)
@@ -73,12 +64,12 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
 
 namespace adobe {
 
-using std::float_t;
-using std::double_t;
+using std::tr1::float_t;
+using std::tr1::double_t;
 
-using std::round;
-using std::lround;
-using std::trunc;
+using std::tr1::round;
+using std::tr1::lround;
+using std::tr1::trunc;
 
 } // namespace adobe