diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 03c27d93..23b01ee1 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -5,6 +5,8 @@
 #include "d/d_base.h"
 #include "d/d_fader.h"
 #include "d/d_room.h"
+#include "egg/gfx/eggPostEffectBlur.h"
+#include "egg/gfx/eggScreenEffectBlur.h"
 #include "m/m_allocator.h"
 #include "m/m_mtx.h"
 #include "m/m_vec.h"
@@ -29,30 +31,6 @@ private:
     dRoom_c *mRooms[MAX_ROOM_NUMBER - 1];
 };
 
-class EggScreenEffectBlur {
-public:
-    EggScreenEffectBlur();
-    ~EggScreenEffectBlur();
-
-private:
-    u8 _0x00[0x38 - 0x00];
-};
-
-class EggPostEffectBlur {
-public:
-    EggPostEffectBlur();
-    ~EggPostEffectBlur() {}
-
-    void setField0x30(f32 val) {
-        field_0x30 = val;
-    }
-
-private:
-    u8 _0x00[0x30 - 0x00];
-    f32 field_0x30;
-    u8 _0x03[0x78 - 0x34];
-};
-
 class MapRelated {
 friend class dStage_c;
     struct Child {
@@ -79,8 +57,8 @@ public:
     /* 0x124 */ f32 field_0x124;
     /* 0x128 */ f32 field_0x128;
     /* 0x12C */ f32 field_0x12C;
-    /* 0x130 */ EggScreenEffectBlur mScreenEffect;
-    /* 0x168 */ EggPostEffectBlur mPostEffect;
+    /* 0x130 */ EGG::ScreenEffectBlur mScreenEffect;
+    /* 0x168 */ EGG::PostEffectBlur mPostEffect;
     /* 0x1E0 */ u32 field_0x1E0;
     /* 0x1E4 */ u16 field_0x1E4;
     /* 0x1E6 */ u16 field_0x1E6;
diff --git a/include/egg/gfx/eggPostEffectBlur.h b/include/egg/gfx/eggPostEffectBlur.h
index 61133991..4c116d62 100644
--- a/include/egg/gfx/eggPostEffectBlur.h
+++ b/include/egg/gfx/eggPostEffectBlur.h
@@ -1,6 +1,24 @@
 #ifndef EGG_POST_EFFECT_BLUR_H
 #define EGG_POST_EFFECT_BLUR_H
 
-namespace EGG {} // namespace EGG
+#include "common.h"
+namespace EGG {
+
+class PostEffectBlur {
+public:
+    PostEffectBlur();
+    ~PostEffectBlur() {}
+
+    void setField0x30(f32 val) {
+        field_0x30 = val;
+    }
+
+private:
+    u8 _0x00[0x30 - 0x00];
+    f32 field_0x30;
+    u8 _0x03[0x78 - 0x34];
+};
+
+} // namespace EGG
 
 #endif
diff --git a/include/egg/gfx/eggScreenEffectBlur.h b/include/egg/gfx/eggScreenEffectBlur.h
index 18f33154..0553161f 100644
--- a/include/egg/gfx/eggScreenEffectBlur.h
+++ b/include/egg/gfx/eggScreenEffectBlur.h
@@ -1,6 +1,18 @@
 #ifndef EGG_SCREEN_EFFECT_BLUR_H
 #define EGG_SCREEN_EFFECT_BLUR_H
 
-namespace EGG {} // namespace EGG
+#include "common.h"
+namespace EGG {
+
+class ScreenEffectBlur {
+public:
+    ScreenEffectBlur();
+    ~ScreenEffectBlur();
+
+private:
+    u8 _0x00[0x38 - 0x00];
+};
+
+} // namespace EGG
 
 #endif