diff --git a/src/config/tnlParameterContainer.cpp b/src/config/tnlParameterContainer.cpp
index 44ed4a1ae7365695d799342d88ec7980be0019b6..cf36707b7a833d1afde4e89f1b2872e0af4b2fe6 100644
--- a/src/config/tnlParameterContainer.cpp
+++ b/src/config/tnlParameterContainer.cpp
@@ -18,7 +18,9 @@
 #include <ctype.h>
 #include <cstring>
 #include <stdio.h>
+
 #include "tnlParameterContainer.h"
+#include <core/tnlObject.h>
 
 bool matob( const char* value, bool& ret_val )
 {
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 5ac2823e6035003a69638bb37ed74c9083e85ea1..8849e1ed82bfc9446f9bfe4e8894a3bf1af66c57 100755
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -6,10 +6,10 @@ ADD_SUBDIRECTORY( vectors )
 set (headers tnlAssert.h               
              tnlConstants.h
              tnlCurve.h
-      	     tnlCuda.h
+             tnlCuda.h
              tnlCudaDeviceInfo.h
              tnlDataElement.h
-  	     tnlDevice.h
+             tnlDevice.h
              tnlDynamicTypeTag.h
              tnlFeature.h
              tnlFile.h 
@@ -40,7 +40,7 @@ set( common_SOURCES
      ${CURRENT_DIR}/tnlFile.cpp
      ${CURRENT_DIR}/tnlFlopsCounter.cpp 
      ${CURRENT_DIR}/tnlLogger.cpp 
-     ${CURRENT_DIR}/tnlObject.cpp 
+     ${CURRENT_DIR}/tnlObject.cpp
      ${CURRENT_DIR}/tnlStatistics.cpp
      ${CURRENT_DIR}/tnlString.cpp 
      ${CURRENT_DIR}/tnlTimerCPU.cpp      
diff --git a/src/core/tnlCurve.h b/src/core/tnlCurve.h
index dce343e3ee02435933fd6599427ce1f66e9b31a3..60150d0cc4649b65051cb4f6ced123d694a10c10 100644
--- a/src/core/tnlCurve.h
+++ b/src/core/tnlCurve.h
@@ -82,7 +82,9 @@ template< class T > class tnlCurve : public tnlObject, public tnlList< tnlCurveE
    public:
    //! Basic contructor
    tnlCurve( const char* name )
-   : tnlObject( name )
+   : tnlObject()
+// FIXME: name property has been removed from tnlObject
+//   : tnlObject( name )
    {
    };
 
diff --git a/src/core/tnlObject_impl.h b/src/core/tnlObject.cpp
similarity index 97%
rename from src/core/tnlObject_impl.h
rename to src/core/tnlObject.cpp
index c5d19d10dc5ed47b5ad1fb45f6e0eb9322f2d5a1..c73f0015592fceb378c2f45829224aa850d29a01 100644
--- a/src/core/tnlObject_impl.h
+++ b/src/core/tnlObject.cpp
@@ -15,9 +15,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef tnlObject_H_IMPLEMENTATION
-#define tnlObject_H_IMPLEMENTATION
-
 #include <core/tnlObject.h>
 #include <debug/tnlDebug.h>
 #include <core/tnlAssert.h>
@@ -30,11 +27,6 @@
 
 const char magic_number[] = "TNLMN";
 
-__cuda_callable__
-tnlObject :: tnlObject()
-{
-}
-
 tnlString tnlObject :: getType()
 {
    return tnlString( "tnlObject" );
@@ -206,4 +198,3 @@ bool parseObjectType( const tnlString& objectType,
    return true;
 }
 
-#endif /* tnlObject_H_IMPLEMENTATION */
diff --git a/src/core/tnlObject.h b/src/core/tnlObject.h
index e7ca120a004b21ef442c0ca4fdf9eb3fe31ba3b6..b9a2dbb51763521e9917921a30f1c86035f69f36 100644
--- a/src/core/tnlObject.h
+++ b/src/core/tnlObject.h
@@ -41,7 +41,7 @@ class tnlObject
 
    //! Basic constructor
    __cuda_callable__
-   tnlObject();
+   tnlObject() {};
 
    /****
     * Type getter. This returns the type in C++ style - for example the returned value
@@ -85,6 +85,4 @@ bool getObjectType( const tnlString& file_name, tnlString& type );
 bool parseObjectType( const tnlString& objectType,
                       tnlList< tnlString >& parsedObjectType );
 
-#include <core/tnlObject_impl.h>
-
 #endif