diff --git a/Entities/SchemeEditor.cpp b/Entities/SchemeEditor.cpp
index 698b3f17e..eab5231a5 100644
--- a/Entities/SchemeEditor.cpp
+++ b/Entities/SchemeEditor.cpp
@@ -772,11 +772,11 @@ void SchemeEditor::UpdateLoadDialog()
     m_pLoadNameCombo->ClearList();
 
     // Get the list of all read in scenes
-    RTEList<Entity *> sceneList;
+    list<Entity *> sceneList;
     g_PresetMan.GetAllOfType(sceneList, "Scene");
 
     // Go through the list and add their names to the combo box
-    for (RTEList<Entity *>::iterator itr = sceneList.begin(); itr != sceneList.end(); ++itr)
+    for (list<Entity *>::iterator itr = sceneList.begin(); itr != sceneList.end(); ++itr)
     {
         // Don't add the special "Editor Scene", users shouldn't be messing with it
         if ((*itr)->GetPresetName() != "Editor Scene")
@@ -840,4 +840,4 @@ void SchemeEditor::UpdateOverwriteDialog()
 	    m_pOverwriteNameLabel->SetText(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + g_SceneMan.GetScene()->GetPresetName());
 }
 
-} // namespace RTE
\ No newline at end of file
+} // namespace RTE
diff --git a/Entities/SchemeEditor.h b/Entities/SchemeEditor.h
index 60444c058..eca073bb8 100644
--- a/Entities/SchemeEditor.h
+++ b/Entities/SchemeEditor.h
@@ -14,8 +14,6 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 // Inclusions of header files
 
-#include "global_types.h"
-
 #include <string>
 #include <deque>
 
@@ -354,4 +352,4 @@ ENTITYALLOCATION(SchemeEditor)
 
 } // namespace RTE
 
-#endif // File
\ No newline at end of file
+#endif // File
diff --git a/Managers/ThreadMan.h b/Managers/ThreadMan.h
index fe1fda4b7..b160d1615 100644
--- a/Managers/ThreadMan.h
+++ b/Managers/ThreadMan.h
@@ -14,8 +14,6 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 // Inclusions of header files
 
-#include "global_types.h"
-
 
 #include <string>
 #include <deque>
@@ -141,4 +139,4 @@ class ThreadMan:
 
 } // namespace RTE
 
-#endif // File
\ No newline at end of file
+#endif // File
diff --git a/Menus/SchemeEditorGUI.cpp b/Menus/SchemeEditorGUI.cpp
index 378dfed27..75f767bbf 100644
--- a/Menus/SchemeEditorGUI.cpp
+++ b/Menus/SchemeEditorGUI.cpp
@@ -740,7 +740,7 @@ void SchemeEditorGUI::Draw(BITMAP *pTargetBitmap, const Vector &targetPos) const
         return;
 
     // The get a list of the currently edited set of placed objects in the Scene
-    const RTEList<SceneObject *> *pSceneObjectList = 0;
+    const list<SceneObject *> *pSceneObjectList = 0;
     if (m_FeatureSet == ONLOADEDIT)
         pSceneObjectList = g_SceneMan.GetScene()->GetPlacedObjects(Scene::PLACEONLOAD);
 
@@ -751,7 +751,7 @@ void SchemeEditorGUI::Draw(BITMAP *pTargetBitmap, const Vector &targetPos) const
         int i = 0;
         Actor *pActor = 0;
 //        HeldDevice *pDevice = 0;
-        for (RTEList<SceneObject *>::const_iterator itr = pSceneObjectList->begin(); itr != pSceneObjectList->end(); ++itr, ++i)
+        for (list<SceneObject *>::const_iterator itr = pSceneObjectList->begin(); itr != pSceneObjectList->end(); ++itr, ++i)
         {
             // Draw the currently held object into the order of the list if it is to be placed inside
             if (m_pCurrentObject && m_DrawCurrentObject && i == m_ObjectListOrder)
diff --git a/Menus/SchemeEditorGUI.h b/Menus/SchemeEditorGUI.h
index ccdb2776d..6d23efad2 100644
--- a/Menus/SchemeEditorGUI.h
+++ b/Menus/SchemeEditorGUI.h
@@ -14,8 +14,6 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 // Inclusions of header files
 
-#include "global_types.h"
-
 //#include "FrameMan.h"
 #include "Sound.h"
 #include "Timer.h"
@@ -329,7 +327,7 @@ class SchemeEditorGUI {
     // Currently placed scene object to make blink when drawing it. NOT OWNED.
     const SceneObject *m_pObjectToBlink;
     // Path found between brain pos and the sky to make sure fair brain placement
-    RTEList<Vector> m_BrainSkyPath;
+    std::list<Vector> m_BrainSkyPath;
     // Sound for enabling and disabling menu
     Sound m_EnterMenuSound;
     Sound m_ExitMenuSound;
@@ -375,4 +373,4 @@ class SchemeEditorGUI {
 
 } // namespace RTE
 
-#endif  // File
\ No newline at end of file
+#endif  // File