diff --git a/binding-cpp/runtime/include/common/EtchBool.h b/binding-cpp/runtime/include/common/EtchBool.h
index 8b58efd..5941873 100644
--- a/binding-cpp/runtime/include/common/EtchBool.h
+++ b/binding-cpp/runtime/include/common/EtchBool.h
@@ -20,8 +20,6 @@
 #define __ETCHBOOL_H__
 
 #include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
 
 class EtchBool :
 public EtchObject {
diff --git a/binding-cpp/runtime/include/common/EtchDate.h b/binding-cpp/runtime/include/common/EtchDate.h
index 3ea9fc6..50baca1 100644
--- a/binding-cpp/runtime/include/common/EtchDate.h
+++ b/binding-cpp/runtime/include/common/EtchDate.h
@@ -18,8 +18,8 @@
 
 #ifndef ETCHDATE_H
 #define ETCHDATE_H
+
 #include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
 
 class EtchDate : public EtchObject {
 public:
diff --git a/binding-cpp/runtime/include/common/EtchDouble.h b/binding-cpp/runtime/include/common/EtchDouble.h
index 7cf2c7a..8046117 100644
--- a/binding-cpp/runtime/include/common/EtchDouble.h
+++ b/binding-cpp/runtime/include/common/EtchDouble.h
@@ -20,8 +20,6 @@
 #define __ETCHDOUBLE_H__
 
 #include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
 
 class EtchDouble :
 public EtchObject {
diff --git a/binding-cpp/runtime/include/common/EtchException.h b/binding-cpp/runtime/include/common/EtchException.h
index 3d690c6..8981bba 100644
--- a/binding-cpp/runtime/include/common/EtchException.h
+++ b/binding-cpp/runtime/include/common/EtchException.h
@@ -19,7 +19,6 @@
 #ifndef __ETCHEXCEPTION_H__
 #define __ETCHEXCEPTION_H__
 
-#include "common/EtchObject.h"
 #include "common/EtchString.h"
 
 class EtchException : public EtchObject {
diff --git a/binding-cpp/runtime/include/common/EtchFloat.h b/binding-cpp/runtime/include/common/EtchFloat.h
index 41cb857..82df7e5 100644
--- a/binding-cpp/runtime/include/common/EtchFloat.h
+++ b/binding-cpp/runtime/include/common/EtchFloat.h
@@ -20,8 +20,6 @@
 #define __ETCHFLOAT_H__
 
 #include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
 
 class EtchFloat :
 public EtchObject {
diff --git a/binding-cpp/runtime/include/common/EtchHashSet.h b/binding-cpp/runtime/include/common/EtchHashSet.h
index 783e006..65f8e12 100644
--- a/binding-cpp/runtime/include/common/EtchHashSet.h
+++ b/binding-cpp/runtime/include/common/EtchHashSet.h
@@ -18,15 +18,11 @@
 
 #ifndef __ETCHSET_H__
 #define __ETCHSET_H__
-#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
+
 #include "common/EtchObjectHash.h"
 #include "common/EtchComparator.h"
 #include "capu/container/HashSet.h"
 
-
-
 template <class T, class H = EtchObjectHash, class C = EtchComparator<T> >
 class EtchHashSet : public EtchObject {
 
diff --git a/binding-cpp/runtime/include/common/EtchHashTable.h b/binding-cpp/runtime/include/common/EtchHashTable.h
index 93f0452..95957af 100644
--- a/binding-cpp/runtime/include/common/EtchHashTable.h
+++ b/binding-cpp/runtime/include/common/EtchHashTable.h
@@ -19,9 +19,6 @@
 #ifndef __ETCHHASHTABLE_H__
 #define __ETCHHASHTABLE_H__
 
-#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
 #include "common/EtchObjectHash.h"
 #include "common/EtchComparator.h"
 #include "capu/container/HashTable.h"
diff --git a/binding-cpp/runtime/include/common/EtchList.h b/binding-cpp/runtime/include/common/EtchList.h
index 570a127..6b4989f 100644
--- a/binding-cpp/runtime/include/common/EtchList.h
+++ b/binding-cpp/runtime/include/common/EtchList.h
@@ -20,9 +20,6 @@
 #define __ETCHLIST_H__
 
 #include "capu/container/List.h"
-#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
 #include "common/EtchComparator.h"
 
 template <class T, class C = EtchComparator<T> >
diff --git a/binding-cpp/runtime/include/common/EtchLong.h b/binding-cpp/runtime/include/common/EtchLong.h
index 806a7e2..7b36cbf 100644
--- a/binding-cpp/runtime/include/common/EtchLong.h
+++ b/binding-cpp/runtime/include/common/EtchLong.h
@@ -20,8 +20,6 @@
 #define __ETCHLONG_H__
 
 #include "common/EtchNumber.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
 
 class EtchLong :
 public EtchNumber {
diff --git a/binding-cpp/runtime/include/common/EtchNativeArray.h b/binding-cpp/runtime/include/common/EtchNativeArray.h
index fce1bfb..f869735 100644
--- a/binding-cpp/runtime/include/common/EtchNativeArray.h
+++ b/binding-cpp/runtime/include/common/EtchNativeArray.h
@@ -20,9 +20,6 @@
 #define __ETCHNATIVEARRAY_H__
 
 #include "capu/util/SmartPointer.h"
-#include "common/EtchError.h"
-#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
 #include "common/EtchTypes.h"
 
 
diff --git a/binding-cpp/runtime/include/common/EtchObject.h b/binding-cpp/runtime/include/common/EtchObject.h
index 1b80768..45093bb 100644
--- a/binding-cpp/runtime/include/common/EtchObject.h
+++ b/binding-cpp/runtime/include/common/EtchObject.h
@@ -19,11 +19,10 @@
 #ifndef __ETCHOBJECT_H__
 #define __ETCHOBJECT_H__
 
-#include "capu/util/SmartPointer.h"
 #include "capu/container/List.h"
-#include "common/EtchError.h"
 
-class EtchObjectType;
+#include "common/EtchError.h"
+#include "common/EtchObjectType.h"
 
 class EtchObject {
 public:
diff --git a/binding-cpp/runtime/include/common/EtchObjectType.h b/binding-cpp/runtime/include/common/EtchObjectType.h
index d0fdf31..2373477 100644
--- a/binding-cpp/runtime/include/common/EtchObjectType.h
+++ b/binding-cpp/runtime/include/common/EtchObjectType.h
@@ -22,7 +22,6 @@
 #define __ETCHOBJECTTYPE_H__
 
 #include "EtchConfig.h"
-#include "common/EtchObject.h"
 #include "capu/util/SmartPointer.h"
 
 enum EtchObjectTypeIds {
diff --git a/binding-cpp/runtime/include/common/EtchRuntimeException.h b/binding-cpp/runtime/include/common/EtchRuntimeException.h
index f88ac55..b295cfc 100644
--- a/binding-cpp/runtime/include/common/EtchRuntimeException.h
+++ b/binding-cpp/runtime/include/common/EtchRuntimeException.h
@@ -20,7 +20,6 @@
 #define __ETCHRUNTIMEEXCEPTION_H__
 
 #include "common/EtchException.h"
-#include "common/EtchError.h"
 
 class EtchRuntimeException : public EtchException {
 public:
diff --git a/binding-cpp/runtime/include/common/EtchServerSocket.h b/binding-cpp/runtime/include/common/EtchServerSocket.h
index e1aa9ea..d8ea130 100644
--- a/binding-cpp/runtime/include/common/EtchServerSocket.h
+++ b/binding-cpp/runtime/include/common/EtchServerSocket.h
@@ -19,10 +19,8 @@
 #ifndef __ETCHSERVERSOCKET_H__
 #define __ETCHSERVERSOCKET_H__
 
-
 #include "capu/os/ServerSocket.h"
 #include "capu/os/Socket.h"
-#include "capu/util/SmartPointer.h"
 #include "common/EtchSocket.h"
 
 class EtchServerSocket : public EtchObject {
diff --git a/binding-cpp/runtime/include/common/EtchShort.h b/binding-cpp/runtime/include/common/EtchShort.h
index c9000ed..d30b855 100644
--- a/binding-cpp/runtime/include/common/EtchShort.h
+++ b/binding-cpp/runtime/include/common/EtchShort.h
@@ -20,8 +20,6 @@
 #define __ETCHSHORT_H__
 
 #include "common/EtchNumber.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
 
 class EtchShort :
 public EtchNumber {
diff --git a/binding-cpp/runtime/include/common/EtchSocket.h b/binding-cpp/runtime/include/common/EtchSocket.h
index b4163a7..8543edd 100644
--- a/binding-cpp/runtime/include/common/EtchSocket.h
+++ b/binding-cpp/runtime/include/common/EtchSocket.h
@@ -18,10 +18,9 @@
 
 #ifndef __ETCHSOCKET_H__
 #define __ETCHSOCKET_H__
+
 #include "capu/os/Socket.h"
 #include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
 
 class EtchSocket : public EtchObject {
 public:
diff --git a/binding-cpp/runtime/include/common/EtchString.h b/binding-cpp/runtime/include/common/EtchString.h
index 077a1ce..ce6529f 100644
--- a/binding-cpp/runtime/include/common/EtchString.h
+++ b/binding-cpp/runtime/include/common/EtchString.h
@@ -19,9 +19,7 @@
 #ifndef __ETCHSTRING_H__
 #define __ETCHSTRING_H__
 
-#include "common/EtchError.h"
 #include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
 
 /**
  * String type.
diff --git a/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h b/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
index 9b14fb9..47e1988 100644
--- a/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
+++ b/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
@@ -23,8 +23,6 @@
 #include "common/EtchAuthenticationException.h"
 #include "serialization/EtchImportExportHelper.h"
 #include "serialization/EtchStructValue.h"
-#include "serialization/EtchType.h"
-#include "serialization/EtchField.h"
 #include "serialization/EtchClass2TypeMap.h"
 #include "serialization/EtchValidatorString.h"
 
diff --git a/binding-cpp/runtime/include/serialization/EtchBinaryTaggedData.h b/binding-cpp/runtime/include/serialization/EtchBinaryTaggedData.h
index 3adc08b..3c68388 100644
--- a/binding-cpp/runtime/include/serialization/EtchBinaryTaggedData.h
+++ b/binding-cpp/runtime/include/serialization/EtchBinaryTaggedData.h
@@ -19,17 +19,7 @@
 #ifndef __ETCHBINARYTAGGEDDATA_H__
 #define __ETCHBINARYTAGGEDDATA_H__
 
-#include "capu/util/SmartPointer.h"
-#include "common/EtchObject.h"
-#include "common/EtchBool.h"
-#include "common/EtchByte.h"
-#include "common/EtchShort.h"
-#include "common/EtchInt32.h"
-#include "common/EtchLong.h"
-#include "common/EtchFloat.h"
-#include "common/EtchDouble.h"
-#include "common/EtchNativeArray.h"
-#include "serialization/EtchValueFactory.h"
+#include "common/EtchTypes.h"
 #include "serialization/EtchTypeCodes.h"
 #include "serialization/EtchTaggedData.h"
 
diff --git a/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h b/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h
index 8758216..dd8a862 100644
--- a/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h
+++ b/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h
@@ -20,7 +20,6 @@
 #ifndef __ETCHCLASS2TYPEMAP_H__
 #define __ETCHCLASS2TYPEMAP_H__
 
-#include "capu/util/SmartPointer.h"
 #include "common/EtchInt32.h"
 #include "serialization/EtchType.h"
 
diff --git a/binding-cpp/runtime/include/serialization/EtchDateSerializer.h b/binding-cpp/runtime/include/serialization/EtchDateSerializer.h
index 8f60086..c9afe4c 100644
--- a/binding-cpp/runtime/include/serialization/EtchDateSerializer.h
+++ b/binding-cpp/runtime/include/serialization/EtchDateSerializer.h
@@ -23,7 +23,6 @@
 #include "serialization/EtchImportExportHelper.h"
 #include "serialization/EtchStructValue.h"
 #include "serialization/EtchField.h"
-#include "serialization/EtchType.h"
 #include "serialization/EtchClass2TypeMap.h"
 #include "serialization/EtchValidatorLong.h"
 
diff --git a/binding-cpp/runtime/include/serialization/EtchFieldMap.h b/binding-cpp/runtime/include/serialization/EtchFieldMap.h
index 16dbeee..d49d612 100644
--- a/binding-cpp/runtime/include/serialization/EtchFieldMap.h
+++ b/binding-cpp/runtime/include/serialization/EtchFieldMap.h
@@ -20,8 +20,8 @@
 #define __ETCHFIELDMAP_H__
 
 #include "common/EtchString.h"
-#include "serialization/EtchField.h"
 #include "common/EtchHashTable.h"
+#include "serialization/EtchField.h"
 
 /**
  * Mapping of id and name to EtchField
@@ -84,7 +84,7 @@
    */
   capu::int32_t size();
 
-  
+
   /**
    * @return the iterator
    */
diff --git a/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h b/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
index c942a19..1b73005 100644
--- a/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
+++ b/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
@@ -27,7 +27,6 @@
 #include "serialization/EtchType.h"
 #include "serialization/EtchClass2TypeMap.h"
 #include "serialization/EtchValidatorObject.h"
-#include "serialization/EtchValidatorObject.h"
 
 class EtchRuntime;
 
diff --git a/binding-cpp/runtime/include/serialization/EtchListSerializer.h b/binding-cpp/runtime/include/serialization/EtchListSerializer.h
index b6c5126..5fee32e 100644
--- a/binding-cpp/runtime/include/serialization/EtchListSerializer.h
+++ b/binding-cpp/runtime/include/serialization/EtchListSerializer.h
@@ -24,7 +24,6 @@
 #include "serialization/EtchImportExportHelper.h"
 #include "serialization/EtchStructValue.h"
 #include "serialization/EtchField.h"
-#include "serialization/EtchType.h"
 #include "serialization/EtchClass2TypeMap.h"
 #include "serialization/EtchValidatorObject.h"
 
diff --git a/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h b/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
index 89c001a..b9b046e 100644
--- a/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
+++ b/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
@@ -25,7 +25,6 @@
 #include "serialization/EtchImportExportHelper.h"
 #include "serialization/EtchStructValue.h"
 #include "serialization/EtchType.h"
-#include "serialization/EtchField.h"
 #include "serialization/EtchClass2TypeMap.h"
 #include "serialization/EtchValidatorString.h"
 
diff --git a/binding-cpp/runtime/include/serialization/EtchSetSerializer.h b/binding-cpp/runtime/include/serialization/EtchSetSerializer.h
index 5de7742..433092b 100644
--- a/binding-cpp/runtime/include/serialization/EtchSetSerializer.h
+++ b/binding-cpp/runtime/include/serialization/EtchSetSerializer.h
@@ -24,7 +24,6 @@
 #include "common/EtchNativeArray.h"
 #include "serialization/EtchImportExportHelper.h"
 #include "serialization/EtchStructValue.h"
-#include "serialization/EtchField.h"
 #include "serialization/EtchType.h"
 #include "serialization/EtchClass2TypeMap.h"
 #include "serialization/EtchValidatorObject.h"
diff --git a/binding-cpp/runtime/include/serialization/EtchTaggedData.h b/binding-cpp/runtime/include/serialization/EtchTaggedData.h
index 7516562..b2bf381 100644
--- a/binding-cpp/runtime/include/serialization/EtchTaggedData.h
+++ b/binding-cpp/runtime/include/serialization/EtchTaggedData.h
@@ -20,10 +20,8 @@
 #define __ETCHTAGGEDDATA_H__
 #include "serialization/EtchValueFactory.h"
 #include "serialization/EtchValidatorStructValue.h"
-#include "serialization/EtchType.h"
-#include "common/EtchArrayValue.h"
 #include "serialization/EtchTypeCodes.h"
-#include "common/EtchObject.h"
+#include "common/EtchArrayValue.h"
 #include "common/EtchNativeArray.h"
 
 class EtchTaggedData {
@@ -57,7 +55,7 @@
    * @param result the allocated array value.
    * @return ETCH_OK if array is successfully allocated
    *         ETCH_ENO_MEMORY if mem allocation fails
-   *         
+   *
    */
   status_t allocNativeArray(capu::int8_t typeCode, EtchType* customStructType, capu::int32_t dim, capu::int32_t length, capu::SmartPointer<EtchNativeArrayBase> &result);
 
@@ -110,7 +108,7 @@
 
   /**
    * @param c           typeid
-   * @param result      out buffet 
+   * @param result      out buffet
    */
   virtual status_t getCustomStructType(const EtchObjectType* c, EtchType*& result) = 0;
 
diff --git a/binding-cpp/runtime/include/serialization/EtchTaggedDataInput.h b/binding-cpp/runtime/include/serialization/EtchTaggedDataInput.h
index 096644b..c06e52c 100644
--- a/binding-cpp/runtime/include/serialization/EtchTaggedDataInput.h
+++ b/binding-cpp/runtime/include/serialization/EtchTaggedDataInput.h
@@ -20,7 +20,6 @@
 #define	__ETCHTAGGEDDATAINPUT_H__
 #include "transport/EtchFlexBuffer.h"
 #include "transport/EtchMessage.h"
-#include "capu/util/SmartPointer.h"
 
 class EtchTaggedDataInput {
 public:
diff --git a/binding-cpp/runtime/include/serialization/EtchType.h b/binding-cpp/runtime/include/serialization/EtchType.h
index 427df07..321d91a 100644
--- a/binding-cpp/runtime/include/serialization/EtchType.h
+++ b/binding-cpp/runtime/include/serialization/EtchType.h
@@ -19,7 +19,6 @@
 #ifndef __ETCHTYPE_H__
 #define __ETCHTYPE_H__
 
-#include "capu/util/SmartPointer.h"
 #include "common/EtchString.h"
 #include "common/EtchHashTable.h"
 #include "serialization/EtchDirection.h"
diff --git a/binding-cpp/runtime/include/serialization/EtchValidator.h b/binding-cpp/runtime/include/serialization/EtchValidator.h
index c3cf9a0..4aad362 100644
--- a/binding-cpp/runtime/include/serialization/EtchValidator.h
+++ b/binding-cpp/runtime/include/serialization/EtchValidator.h
@@ -19,10 +19,7 @@
 #ifndef __ETCHVALIDATOR_H__
 #define __ETCHVALIDATOR_H__
 
-#include "capu/util/SmartPointer.h"
 #include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
 #include "support/EtchRuntime.h"
 
 class EtchValidator : public EtchObject {
diff --git a/binding-cpp/runtime/include/serialization/EtchValidatorByte.h b/binding-cpp/runtime/include/serialization/EtchValidatorByte.h
index aca2467..b282c21 100644
--- a/binding-cpp/runtime/include/serialization/EtchValidatorByte.h
+++ b/binding-cpp/runtime/include/serialization/EtchValidatorByte.h
@@ -24,7 +24,6 @@
 #include "common/EtchShort.h"
 #include "common/EtchInt32.h"
 #include "common/EtchLong.h"
-#include "serialization/EtchTypeCodes.h"
 #include "common/EtchNativeArray.h"
 #include "capu/os/NumericLimits.h"
 
diff --git a/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h b/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h
index f26b972..3570da1 100644
--- a/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h
+++ b/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h
@@ -18,12 +18,12 @@
 
 #ifndef __ETCHVALIDATORDOUBLE_H__
 #define __ETCHVALIDATORDOUBLE_H__
+
 #include "serialization/EtchTypeValidator.h"
 #include "common/EtchFloat.h"
 #include "common/EtchDouble.h"
-#include "serialization/EtchTypeCodes.h"
-#include "capu/os/NumericLimits.h"
 #include "common/EtchNativeArray.h"
+#include "capu/os/NumericLimits.h"
 
 class EtchRuntime;
 
diff --git a/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h b/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h
index 7fac03a..ba4bddf 100644
--- a/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h
+++ b/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h
@@ -22,7 +22,6 @@
 #include "serialization/EtchTypeValidator.h"
 #include "common/EtchDouble.h"
 #include "common/EtchFloat.h"
-#include "serialization/EtchTypeCodes.h"
 #include "common/EtchNativeArray.h"
 
 class EtchRuntime;
diff --git a/binding-cpp/runtime/include/serialization/EtchValidatorInt.h b/binding-cpp/runtime/include/serialization/EtchValidatorInt.h
index 4f89148..1a8e9a4 100644
--- a/binding-cpp/runtime/include/serialization/EtchValidatorInt.h
+++ b/binding-cpp/runtime/include/serialization/EtchValidatorInt.h
@@ -24,7 +24,6 @@
 #include "common/EtchShort.h"
 #include "common/EtchInt32.h"
 #include "common/EtchLong.h"
-#include "serialization/EtchTypeCodes.h"
 #include "common/EtchNativeArray.h"
 #include "capu/os/NumericLimits.h"
 
diff --git a/binding-cpp/runtime/include/serialization/EtchValidatorLong.h b/binding-cpp/runtime/include/serialization/EtchValidatorLong.h
index 8b48f22..fa734e0 100644
--- a/binding-cpp/runtime/include/serialization/EtchValidatorLong.h
+++ b/binding-cpp/runtime/include/serialization/EtchValidatorLong.h
@@ -23,7 +23,6 @@
 #include "common/EtchShort.h"
 #include "common/EtchInt32.h"
 #include "common/EtchLong.h"
-#include "serialization/EtchTypeCodes.h"
 #include "common/EtchNativeArray.h"
 #include "capu/os/NumericLimits.h"
 
diff --git a/binding-cpp/runtime/include/serialization/EtchValidatorShort.h b/binding-cpp/runtime/include/serialization/EtchValidatorShort.h
index e8a365e..14b49fe 100644
--- a/binding-cpp/runtime/include/serialization/EtchValidatorShort.h
+++ b/binding-cpp/runtime/include/serialization/EtchValidatorShort.h
@@ -24,7 +24,6 @@
 #include "common/EtchShort.h"
 #include "common/EtchInt32.h"
 #include "common/EtchLong.h"
-#include "serialization/EtchTypeCodes.h"
 #include "common/EtchNativeArray.h"
 #include "capu/os/NumericLimits.h"
 
diff --git a/binding-cpp/runtime/include/serialization/EtchValueFactory.h b/binding-cpp/runtime/include/serialization/EtchValueFactory.h
index d5830a5..7330edd 100644
--- a/binding-cpp/runtime/include/serialization/EtchValueFactory.h
+++ b/binding-cpp/runtime/include/serialization/EtchValueFactory.h
@@ -20,11 +20,9 @@
 #ifndef __ETCHVALUEFACTORY_H__
 #define __ETCHVALUEFACTORY_H__
 
-
-#include "serialization/EtchLevel.h"
 #include "common/EtchString.h"
+#include "serialization/EtchLevel.h"
 #include "serialization/EtchField.h"
-#include "capu/util/SmartPointer.h"
 
 class EtchStructValue;
 class EtchMessage;
diff --git a/binding-cpp/runtime/include/transport/EtchConnection.h b/binding-cpp/runtime/include/transport/EtchConnection.h
index 6bb3870..f4ee770 100644
--- a/binding-cpp/runtime/include/transport/EtchConnection.h
+++ b/binding-cpp/runtime/include/transport/EtchConnection.h
@@ -21,11 +21,9 @@
 
 #include "capu/os/Mutex.h"
 #include "capu/os/Thread.h"
-#include "capu/util/SmartPointer.h"
 #include "common/EtchError.h"
 #include "common/EtchException.h"
 #include "common/EtchInt32.h"
-#include "common/EtchObject.h"
 #include "common/EtchString.h"
 #include "support/EtchMonitor.h"
 #include "transport/EtchSession.h"
@@ -155,7 +153,7 @@
 
 template <class S>
 EtchConnection<S>::EtchConnection()
-: mStatus(EtchString("status"), EtchSession::DOWN()) {
+: mSession(0), mThread(0), mStatus(EtchString("status"), EtchSession::DOWN()) {
 }
 
 template <class S>
diff --git a/binding-cpp/runtime/include/transport/EtchMessage.h b/binding-cpp/runtime/include/transport/EtchMessage.h
index f51d5cf..ee8e44f 100644
--- a/binding-cpp/runtime/include/transport/EtchMessage.h
+++ b/binding-cpp/runtime/include/transport/EtchMessage.h
@@ -20,7 +20,6 @@
 #ifndef __ETCHMESSAGE_H__
 #define __ETCHMESSAGE_H__
 
-#include "capu/util/SmartPointer.h"
 #include "serialization/EtchType.h"
 #include "serialization/EtchValueFactory.h"
 #include "serialization/EtchStructValue.h"
diff --git a/binding-cpp/runtime/include/transport/EtchMessagizer.h b/binding-cpp/runtime/include/transport/EtchMessagizer.h
index f32de69..74c8546 100644
--- a/binding-cpp/runtime/include/transport/EtchMessagizer.h
+++ b/binding-cpp/runtime/include/transport/EtchMessagizer.h
@@ -19,12 +19,8 @@
 #ifndef __ETCHMESSAGIZER_H__
 #define __ETCHMESSAGIZER_H__
 
-#include "capu/util/SmartPointer.h"
 #include "capu/os/Mutex.h"
 #include "common/EtchException.h"
-#include "serialization/EtchTaggedDataInput.h"
-#include "serialization/EtchTaggedDataOutput.h"
-#include "serialization/EtchBinaryTaggedData.h"
 #include "serialization/EtchBinaryTaggedDataInput.h"
 #include "serialization/EtchBinaryTaggedDataOutput.h"
 #include "transport/EtchFormat.h"
diff --git a/binding-cpp/runtime/include/transport/EtchSession.h b/binding-cpp/runtime/include/transport/EtchSession.h
index 8fefa00..7284b6f 100644
--- a/binding-cpp/runtime/include/transport/EtchSession.h
+++ b/binding-cpp/runtime/include/transport/EtchSession.h
@@ -19,10 +19,7 @@
 #ifndef __ETCHSESSION_H__
 #define __ETCHSESSION_H__
 
-#include "capu/util/SmartPointer.h"
-#include "common/EtchObject.h"
 #include "common/EtchString.h"
-#include "common/EtchError.h"
 
 class EtchSession {
 public:
diff --git a/binding-cpp/runtime/include/transport/EtchSessionData.h b/binding-cpp/runtime/include/transport/EtchSessionData.h
index e12d319..133467b 100644
--- a/binding-cpp/runtime/include/transport/EtchSessionData.h
+++ b/binding-cpp/runtime/include/transport/EtchSessionData.h
@@ -19,7 +19,6 @@
 #ifndef __ETCHSESSIONDATA_H__
 #define __ETCHSESSIONDATA_H__
 
-#include "capu/util/SmartPointer.h"
 #include "common/EtchError.h"
 #include "transport/EtchFlexBuffer.h"
 #include "transport/EtchSession.h"
diff --git a/binding-cpp/runtime/include/transport/EtchSessionListener.h b/binding-cpp/runtime/include/transport/EtchSessionListener.h
index 173145e..40f435b 100644
--- a/binding-cpp/runtime/include/transport/EtchSessionListener.h
+++ b/binding-cpp/runtime/include/transport/EtchSessionListener.h
@@ -19,8 +19,6 @@
 #ifndef __ETCHSESSIONLISTENER_H__
 #define __ETCHSESSIONLISTENER_H__
 
-#include "capu/util/SmartPointer.h"
-#include "common/EtchError.h"
 #include "transport/EtchSession.h"
 
 
diff --git a/binding-cpp/runtime/include/transport/EtchSessionMessage.h b/binding-cpp/runtime/include/transport/EtchSessionMessage.h
index b5af1e4..4a094aa 100644
--- a/binding-cpp/runtime/include/transport/EtchSessionMessage.h
+++ b/binding-cpp/runtime/include/transport/EtchSessionMessage.h
@@ -19,8 +19,6 @@
 #ifndef __ETCHSESSIONMESSAGE_H__
 #define __ETCHSESSIONMESSAGE_H__
 
-#include "capu/util/SmartPointer.h"
-#include "common/EtchError.h"
 #include "transport/EtchSession.h"
 #include "transport/EtchWho.h"
 #include "transport/EtchMessage.h"
diff --git a/binding-cpp/runtime/include/transport/EtchSessionPacket.h b/binding-cpp/runtime/include/transport/EtchSessionPacket.h
index 9541015..3dc9b8a 100644
--- a/binding-cpp/runtime/include/transport/EtchSessionPacket.h
+++ b/binding-cpp/runtime/include/transport/EtchSessionPacket.h
@@ -19,7 +19,6 @@
 #ifndef __ETCHSESSIONPACKET_H__
 #define __ETCHSESSIONPACKET_H__
 
-#include "capu/util/SmartPointer.h"
 #include "transport/EtchSession.h"
 #include "transport/EtchFlexBuffer.h"
 #include "transport/EtchWho.h"
diff --git a/binding-cpp/runtime/include/transport/EtchTcpConnection.h b/binding-cpp/runtime/include/transport/EtchTcpConnection.h
index 8dc73c7..5ec9a3f 100644
--- a/binding-cpp/runtime/include/transport/EtchTcpConnection.h
+++ b/binding-cpp/runtime/include/transport/EtchTcpConnection.h
@@ -20,9 +20,6 @@
 #define __ETCHTCPCONNECTION_H__
 
 #include "capu/util/Runnable.h"
-
-#include "common/EtchObject.h"
-#include "common/EtchError.h"
 #include "common/EtchString.h"
 #include "common/EtchSocket.h"
 #include "support/EtchRuntime.h"
@@ -35,7 +32,6 @@
 #include "util/EtchResources.h"
 #include "util/EtchLogger.h"
 
-class EtchRuntime;
 
 /**
  * Implementation of connection which handles a tcp connection.
diff --git a/binding-cpp/runtime/include/transport/EtchTcpListener.h b/binding-cpp/runtime/include/transport/EtchTcpListener.h
index 93bd3c2..6e6d568 100644
--- a/binding-cpp/runtime/include/transport/EtchTcpListener.h
+++ b/binding-cpp/runtime/include/transport/EtchTcpListener.h
@@ -23,7 +23,6 @@
 #include "capu/os/ServerSocket.h"
 #include "capu/os/Socket.h"
 #include "capu/util/Runnable.h"
-#include "capu/util/SmartPointer.h"
 
 #include "common/EtchError.h"
 #include "common/EtchObject.h"
diff --git a/binding-cpp/runtime/include/transport/EtchTcpOption.h b/binding-cpp/runtime/include/transport/EtchTcpOption.h
index 4c323ee..2f51224 100644
--- a/binding-cpp/runtime/include/transport/EtchTcpOption.h
+++ b/binding-cpp/runtime/include/transport/EtchTcpOption.h
@@ -19,7 +19,6 @@
 #ifndef __ETCHTCPOPTION_H__
 #define __ETCHTCPOPTION_H__
 
-#include "common/EtchString.h"
 #include "util/EtchURL.h"
 
 class EtchTcpOption {
diff --git a/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h b/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
index d330654..558bc11 100644
--- a/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
+++ b/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
@@ -26,7 +26,6 @@
 #include "support/EtchStack.h"
 #include "transport/EtchTransportMessage.h"
 #include "transport/EtchTransportData.h"
-#include "transport/EtchTcpConnection.h"
 #include "transport/EtchTransportPacket.h"
 #include "transport/EtchPacketizer.h"
 #include "transport/EtchTcpConnection.h"
diff --git a/binding-cpp/runtime/include/transport/EtchTransport.h b/binding-cpp/runtime/include/transport/EtchTransport.h
index 20dde32..18eb755 100644
--- a/binding-cpp/runtime/include/transport/EtchTransport.h
+++ b/binding-cpp/runtime/include/transport/EtchTransport.h
@@ -19,9 +19,6 @@
 #ifndef __ETCHTRANSPORT_H__
 #define __ETCHTRANSPORT_H__
 
-#include "capu/util/SmartPointer.h"
-#include "common/EtchError.h"
-#include "common/EtchObject.h"
 #include "common/EtchString.h"
 
 /**
diff --git a/binding-cpp/runtime/include/transport/EtchTransportData.h b/binding-cpp/runtime/include/transport/EtchTransportData.h
index 84df2c0..185ab16 100644
--- a/binding-cpp/runtime/include/transport/EtchTransportData.h
+++ b/binding-cpp/runtime/include/transport/EtchTransportData.h
@@ -18,7 +18,7 @@
 
 #ifndef __ETCHTRANSPORTDATA_H__
 #define __ETCHTRANSPORTDATA_H__
-#include "capu/util/SmartPointer.h"
+
 #include "transport/EtchSessionData.h"
 #include "transport/EtchTransport.h"
 #include "transport/EtchFlexBuffer.h"
diff --git a/binding-cpp/runtime/include/transport/EtchTransportFactory.h b/binding-cpp/runtime/include/transport/EtchTransportFactory.h
index 96871ef..e07cb09 100644
--- a/binding-cpp/runtime/include/transport/EtchTransportFactory.h
+++ b/binding-cpp/runtime/include/transport/EtchTransportFactory.h
@@ -22,7 +22,6 @@
 #define __ETCHTRANSPORTFACTORY_H__
 
 #include "common/EtchTypes.h"
-#include "common/EtchError.h"
 #include "support/EtchServerFactory.h"
 #include "transport/EtchTransport.h"
 #include "transport/EtchTransportMessage.h"
diff --git a/binding-cpp/runtime/include/util/EtchURL.h b/binding-cpp/runtime/include/util/EtchURL.h
index 64836be..bd582f1 100644
--- a/binding-cpp/runtime/include/util/EtchURL.h
+++ b/binding-cpp/runtime/include/util/EtchURL.h
@@ -18,7 +18,7 @@
 
 #ifndef __ETCHURL_H__
 #define __ETCHURL_H__
-#include "common/EtchError.h"
+
 #include "common/EtchString.h"
 #include "common/EtchHashTable.h"
 #include "common/EtchList.h"
diff --git a/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp b/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp
index 54e7c67..0e618b5 100644
--- a/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp
+++ b/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp
@@ -19,19 +19,7 @@
  */
 
 #include "common/EtchArrayValue.h"
-#include "common/EtchObject.h"
-#include "common/EtchInt32.h"
-#include "common/EtchBool.h"
-#include "common/EtchByte.h"
-#include "common/EtchShort.h"
-#include "common/EtchLong.h"
-#include "common/EtchDouble.h"
-#include "common/EtchFloat.h"
-#include "common/EtchString.h"
-#include "common/EtchDate.h"
-#include "common/EtchList.h"
-#include "common/EtchHashTable.h"
-#include "common/EtchHashSet.h"
+#include "common/EtchTypes.h"
 
 const EtchObjectType* EtchArrayValue::TYPE() {
   static const EtchObjectType TYPE(EOTID_ARRAY_VALUE, NULL);
diff --git a/binding-cpp/runtime/src/main/common/EtchInt32.cpp b/binding-cpp/runtime/src/main/common/EtchInt32.cpp
index c0c2e9f..01c2a81 100644
--- a/binding-cpp/runtime/src/main/common/EtchInt32.cpp
+++ b/binding-cpp/runtime/src/main/common/EtchInt32.cpp
@@ -17,8 +17,6 @@
  */
 
 #include "common/EtchInt32.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
 
 const EtchObjectType* EtchInt32::TYPE() {
    const static EtchObjectType TYPE(EOTID_INT32, NULL);
diff --git a/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp b/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp
index 8d91f18..a7990e2 100644
--- a/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp
+++ b/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp
@@ -17,18 +17,6 @@
  */
 
 #include "common/EtchNativeArray.h"
-#include "common/EtchInt32.h"
-#include "common/EtchBool.h"
-#include "common/EtchByte.h"
-#include "common/EtchShort.h"
-#include "common/EtchLong.h"
-#include "common/EtchDouble.h"
-#include "common/EtchFloat.h"
-#include "common/EtchString.h"
-#include "common/EtchDate.h"
-#include "common/EtchHashTable.h"
-#include "common/EtchHashSet.h"
-#include "common/EtchList.h"
 
 status_t EtchNativeArrayBase::getBase(Pos pos, capu::SmartPointer<EtchObject> &result) {
 
diff --git a/binding-cpp/runtime/src/main/common/EtchObject.cpp b/binding-cpp/runtime/src/main/common/EtchObject.cpp
index bae5277..f80dbcb 100644
--- a/binding-cpp/runtime/src/main/common/EtchObject.cpp
+++ b/binding-cpp/runtime/src/main/common/EtchObject.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
 
 const EtchObjectType* EtchObject::TYPE() {
   const static EtchObjectType TYPE(EOTID_OBJECT, NULL);
diff --git a/binding-cpp/runtime/src/main/common/EtchObjectType.cpp b/binding-cpp/runtime/src/main/common/EtchObjectType.cpp
index 35f1f39..622a1cd 100644
--- a/binding-cpp/runtime/src/main/common/EtchObjectType.cpp
+++ b/binding-cpp/runtime/src/main/common/EtchObjectType.cpp
@@ -18,8 +18,6 @@
  * under the License.
  */
 #include "common/EtchObjectType.h"
-#include "common/EtchObject.h"
-
 
 const EtchObjectType& EtchObjectType::NATIVE_INT8() {
   static const EtchObjectType type(EOTID_BYTE, NULL);
diff --git a/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp b/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp
index 3d26297..10e1a8b 100644
--- a/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp
+++ b/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "common/EtchServerSocket.h"
 #include "capu/util/SmartPointer.h"
-#include "common/EtchSocket.h"
 
 const EtchObjectType* EtchServerSocket::TYPE() {
   const static EtchObjectType TYPE(EOTID_SERVER_SOCKET, NULL);
diff --git a/binding-cpp/runtime/src/main/serialization/EtchTaggedData.cpp b/binding-cpp/runtime/src/main/serialization/EtchTaggedData.cpp
index d17d97d..1da35f7 100644
--- a/binding-cpp/runtime/src/main/serialization/EtchTaggedData.cpp
+++ b/binding-cpp/runtime/src/main/serialization/EtchTaggedData.cpp
@@ -17,19 +17,7 @@
  */
 
 #include "serialization/EtchTaggedData.h"
-#include "common/EtchObject.h"
-#include "common/EtchInt32.h"
-#include "common/EtchBool.h"
-#include "common/EtchByte.h"
-#include "common/EtchShort.h"
-#include "common/EtchLong.h"
-#include "common/EtchDouble.h"
-#include "common/EtchFloat.h"
-#include "common/EtchString.h"
-#include "common/EtchDate.h"
-#include "common/EtchList.h"
-#include "common/EtchHashTable.h"
-#include "common/EtchHashSet.h"
+#include "common/EtchTypes.h"
 
 EtchTaggedData::EtchTaggedData(EtchValueFactory* vf)
 : mVf(vf) {
@@ -169,4 +157,4 @@
     }
   }
   return ETCH_ERROR;
-}
\ No newline at end of file
+}