diff --git a/addons/fire/RscTitles.hpp b/addons/fire/RscTitles.hpp
index 02ecd250e4e..fc246b84030 100644
--- a/addons/fire/RscTitles.hpp
+++ b/addons/fire/RscTitles.hpp
@@ -1,5 +1,6 @@
+class RscPicture;
+
 class RscTitles {
-    class RscPicture;
     class GVAR(onFire1) {
         idd = -1;
         movingEnable = "true";
diff --git a/addons/goggles/RscTitles.hpp b/addons/goggles/RscTitles.hpp
index 0716892312d..6bb5364fe12 100644
--- a/addons/goggles/RscTitles.hpp
+++ b/addons/goggles/RscTitles.hpp
@@ -1,6 +1,6 @@
-class RscTitles {
-    #include "define.hpp"
+class RscPicture;
 
+class RscTitles {
     class RscACE_Goggles_BaseTitle {
         idd = -1;
         onLoad = "uiNamespace setVariable ['ACE_Goggles_Display', _this select 0]";
@@ -19,6 +19,10 @@ class RscTitles {
         class controls {
             class gogglesImage: RscPicture {
                 idc = 10650;
+                x = "safeZoneX";
+                y = "safeZoneY";
+                w = "safeZoneW";
+                h = "safeZoneH";
             };
         };
     };
@@ -33,9 +37,17 @@ class RscTitles {
         class controls {
             class dirtImage: RscPicture {
                 idc = 10660;
+                x = "safeZoneX";
+                y = "safeZoneY";
+                w = "safeZoneW";
+                h = "safeZoneH";
             };
             class dustImage: RscPicture {
                 idc = 10662;
+                x = "safeZoneX";
+                y = "safeZoneY";
+                w = "safeZoneW";
+                h = "safeZoneH";
             };
         };
     };
diff --git a/addons/goggles/define.hpp b/addons/goggles/define.hpp
deleted file mode 100644
index 4e641b692c4..00000000000
--- a/addons/goggles/define.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// Control types
-#define CT_STATIC           0
-#define ST_PICTURE        0x30
-
-////////////////
-//Base Classes//
-////////////////
-
-class RscPicture {
-    idc = -1;
-    type = CT_STATIC;
-    style = ST_PICTURE;
-    colorBackground[] = {0,0,0,0};
-    colorText[] = {1,1,1,1};
-    font = "RobotoCondensed";
-    sizeEx = 0;
-    lineSpacing = 0;
-    fixedWidth = 0;
-    shadow = 0;
-    text = "";
-    x = "safeZoneX";
-    y = "safeZoneY";
-    w = "safeZoneW";
-    h = "safeZoneH";
-};