diff --git a/configure.py b/configure.py
index a7c9c1fb6..6705a2717 100644
--- a/configure.py
+++ b/configure.py
@@ -1279,7 +1279,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_obj_mshokki"),
     ActorRel(NonMatching, "d_a_obj_ohatch"),
     ActorRel(NonMatching, "d_a_obj_otble"),
-    ActorRel(NonMatching, "d_a_obj_pbco"),
+    ActorRel(Matching,    "d_a_obj_pbco"),
     ActorRel(NonMatching, "d_a_obj_pirateship"),
     ActorRel(NonMatching, "d_a_obj_quake"),
     ActorRel(NonMatching, "d_a_obj_rcloud"),
diff --git a/include/d/actor/d_a_obj_pbco.h b/include/d/actor/d_a_obj_pbco.h
index 8dfb08b15..15f61a151 100644
--- a/include/d/actor/d_a_obj_pbco.h
+++ b/include/d/actor/d_a_obj_pbco.h
@@ -2,9 +2,10 @@
 #define D_A_OBJ_PBCO_H
 
 #include "SSystem/SComponent/c_phase.h"
-#include "d/d_bg_w.h"
 #include "f_op/f_op_actor.h"
 
+class dBgW;
+
 class daObj_Pbco_c : public fopAc_ac_c {
 public:
     inline s32 _create();
diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp
index 74dfea0d4..c774defc4 100644
--- a/src/d/actor/d_a_obj_pbco.cpp
+++ b/src/d/actor/d_a_obj_pbco.cpp
@@ -23,6 +23,7 @@ void daObj_Pbco_c::set_mtx() {
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
+
 /* 0000018C-000001AC       .text CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     daObj_Pbco_c* a_this = static_cast<daObj_Pbco_c*>(i_this);
@@ -73,6 +74,7 @@ s32 daObj_Pbco_c::_create() {
     }
     return phase_state;
 }
+
 /* 000003A4-00000434       .text daObj_PbcoCreate__FPv */
 static int daObj_PbcoCreate(void* i_this) {
     return static_cast<daObj_Pbco_c*>(i_this)->_create();
@@ -85,28 +87,33 @@ BOOL daObj_Pbco_c::_delete() {
     dComIfG_resDelete(&mPhs, M_arcname);
     return TRUE;
 }
+
 /* 00000434-0000048C       .text daObj_PbcoDelete__FPv */
 static BOOL daObj_PbcoDelete(void* i_this) {
     static_cast<daObj_Pbco_c*>(i_this)->_delete();
     return TRUE;
 }
+
 BOOL daObj_Pbco_c::_execute() {
     if (mpBgW != NULL)
         mpBgW->Move();
     set_mtx();
     return FALSE;
 }
+
 /* 0000048C-000004D0       .text daObj_PbcoExecute__FPv */
 static BOOL daObj_PbcoExecute(void* i_this) {
     return static_cast<daObj_Pbco_c*>(i_this)->_execute();
 }
 
 BOOL daObj_Pbco_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
-    g_env_light.setLightTevColorType(mpModel, &tevStr);
+    dKy_tevstr_c* pTevStr;
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, pTevStr = &tevStr);
+    g_env_light.setLightTevColorType(mpModel, pTevStr);
     mDoExt_modelUpdateDL(mpModel);
     return TRUE;
 }
+
 /* 000004D0-0000053C       .text daObj_PbcoDraw__FPv */
 static BOOL daObj_PbcoDraw(void* i_this) {
     daObj_Pbco_c* a_this = (daObj_Pbco_c*)i_this;