Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp	(revision 1262)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp	(revision 1263)
@@ -38,4 +38,5 @@
 #include "TDecCu.h"
 #include "TLibCommon/TComTU.h"
+#include "TLibCommon/TComPrediction.h"
 #if SVC_EXTENSION
 #include "TDecTop.h"
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.h	(revision 1262)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.h	(revision 1263)
@@ -44,5 +44,4 @@
 
 #include "TLibCommon/TComTrQuant.h"
-#include "TLibCommon/TComPrediction.h"
 #include "TDecEntropy.h"
 
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.cpp	(revision 1262)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.cpp	(revision 1263)
@@ -38,4 +38,5 @@
 #include "TDecEntropy.h"
 #include "TLibCommon/TComTU.h"
+#include "TLibCommon/TComPrediction.h"
 
 #if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.h	(revision 1262)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.h	(revision 1263)
@@ -43,5 +43,4 @@
 #include "TLibCommon/TComSlice.h"
 #include "TLibCommon/TComPic.h"
-#include "TLibCommon/TComPrediction.h"
 #include "TLibCommon/TComSampleAdaptiveOffset.h"
 #include "TLibCommon/TComRectangle.h"
@@ -50,4 +49,5 @@
 class TDecCavlc;
 class ParameterSetManagerDecoder;
+class TComPrediction;
 #if CGS_3D_ASYMLUT
 class TCom3DAsymLUT;
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1262)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1263)
@@ -2207,20 +2207,4 @@
     g_uiAddCUDepth  = max (0, sps->getLog2MinCodingBlockSize() - (Int)sps->getQuadtreeTULog2MinSize() );
 
-    Int  numReorderPics[MAX_TLAYER];
-
-    for( Int temporalLayer=0; temporalLayer < MAX_TLAYER; temporalLayer++ ) 
-    {
-      if( m_commonDecoderParams->getTargetOutputLayerSetIdx() == 0 )
-      {
-        assert( this->getLayerId() == 0 );
-        numReorderPics[temporalLayer] = sps->getNumReorderPics(temporalLayer);
-      }
-      else
-      {        
-        // SHM decoders will use DPB size table in the VPS to determine the number of reorder pictures.
-        numReorderPics[temporalLayer] = vps->getMaxVpsNumReorderPics( getCommonDecoderParams()->getTargetOutputLayerSetIdx() , temporalLayer);
-      }
-    }
-
     if (m_cIlpPic[0] == NULL)
     {
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 1262)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 1263)
@@ -44,4 +44,5 @@
 #include "TLibCommon/TComPic.h"
 #include "TLibCommon/TComTrQuant.h"
+#include "TLibCommon/TComPrediction.h"
 #include "TLibCommon/SEI.h"
 #if CGS_3D_ASYMLUT