Merge pull request #2 from conchurnavid/includes

Cleanup includes order and add missing includes

src/Combiner/AdvancedCombinerManager.cpp

@@ -20,32 +20,35 @@
  *****************************************************************************/
 
 #include "AdvancedCombinerManager.h"
-#include "CombinerStructs.h"
-#include "ExtensionChecker.h"
-#include "MultiTexturingExt.h"
+
 #include "AdvancedTexEnvCombiner.h"
-#include "SimpleTexEnvCombiner.h"
-#include "DummyCombiner.h"
-#include "CombinerStageMerger.h"
+#include "CombinerBase.h"
 #include "CombinerStageCreator.h"
-#include "RomDetector.h"
-#include "m64p.h"
+#include "CombinerStageMerger.h"
+#include "CombinerStructs.h"
+#include "DummyCombiner.h"
+#include "ExtensionChecker.h"
+#include "GBIDefs.h"
+#include "MultiTexturingExt.h"
 #include "OpenGL.h"
+#include "RomDetector.h"
+#include "SimpleTexEnvCombiner.h"
+#include "m64p.h"
 
 static int saRGBExpanded[] = 
 {
     COMBINED,            TEXEL0,              TEXEL1,              PRIMITIVE,        
-    SHADE,               ENVIRONMENT,         ONE,                 NOISE,
-    ZERO,                ZERO,                ZERO,                ZERO,
-    ZERO,                ZERO,                ZERO,                ZERO
+    SHADE,               ENVIRONMENT,         CB_ONE,                 NOISE,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO
 };
 
 static int sbRGBExpanded[] = 
 {
     COMBINED,            TEXEL0,              TEXEL1,              PRIMITIVE,        
     SHADE,               ENVIRONMENT,         CENTER,              K4,
-    ZERO,                ZERO,                ZERO,                ZERO,
-    ZERO,                ZERO,                ZERO,                ZERO
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO
 };
 
 static int mRGBExpanded[] = 
@@ -54,40 +57,40 @@ static int mRGBExpanded[] =
     SHADE,               ENVIRONMENT,         SCALE,               COMBINED_ALPHA,
     TEXEL0_ALPHA,        TEXEL1_ALPHA,        PRIMITIVE_ALPHA,     SHADE_ALPHA,
     ENV_ALPHA,           LOD_FRACTION,        PRIM_LOD_FRAC,       K5,
-    ZERO,                ZERO,                ZERO,                ZERO,
-    ZERO,                ZERO,                ZERO,                ZERO,
-    ZERO,                ZERO,                ZERO,                ZERO,
-    ZERO,                ZERO,                ZERO,                ZERO
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO
 };
 
 static int aRGBExpanded[] = 
 {
     COMBINED,            TEXEL0,              TEXEL1,              PRIMITIVE,        
-    SHADE,               ENVIRONMENT,         ONE,                 ZERO
+    SHADE,               ENVIRONMENT,         CB_ONE,                 CB_ZERO
 };
 
 static int saAExpanded[] = 
 {
     COMBINED,            TEXEL0_ALPHA,        TEXEL1_ALPHA,        PRIMITIVE_ALPHA,        
-    SHADE_ALPHA,         ENV_ALPHA,           ONE,                 ZERO
+    SHADE_ALPHA,         ENV_ALPHA,           CB_ONE,                 CB_ZERO
 };
 
 static int sbAExpanded[] = 
 {
     COMBINED,            TEXEL0_ALPHA,        TEXEL1_ALPHA,        PRIMITIVE_ALPHA,        
-    SHADE_ALPHA,         ENV_ALPHA,           ONE,                 ZERO
+    SHADE_ALPHA,         ENV_ALPHA,           CB_ONE,                 CB_ZERO
 };
 
 static int mAExpanded[] = 
 {
     LOD_FRACTION,        TEXEL0_ALPHA,        TEXEL1_ALPHA,        PRIMITIVE_ALPHA,        
-    SHADE_ALPHA,         ENV_ALPHA,           PRIM_LOD_FRAC,       ZERO,
+    SHADE_ALPHA,         ENV_ALPHA,           PRIM_LOD_FRAC,       CB_ZERO,
 };
 
 static int aAExpanded[] = 
 {
     COMBINED,            TEXEL0_ALPHA,        TEXEL1_ALPHA,        PRIMITIVE_ALPHA,        
-    SHADE_ALPHA,         ENV_ALPHA,           ONE,                 ZERO
+    SHADE_ALPHA,         ENV_ALPHA,           CB_ONE,                 CB_ZERO
 };
 
 //-----------------------------------------------------------------------------
@@ -314,7 +317,7 @@ void AdvancedCombinerManager::getSecondaryCombinerColor(float out[4])
     }
 
     //Get color
-    m_combiner->getCombinerColor(out, currentTexEnv->vertex.secondaryColor, ONE);
+    m_combiner->getCombinerColor(out, currentTexEnv->vertex.secondaryColor, CB_ONE);
 }
 
 //-----------------------------------------------------------------------------

src/Combiner/AdvancedCombinerManager.h

@@ -22,18 +22,18 @@
 #ifndef ADVANCED_COMBINER_MANAGER_H_
 #define ADVANCED_COMBINER_MANAGER_H_
 
-#include "GBIDefs.h"
-#include "CombinerStructs.h"
 #include "CombinerCache.h"
+#include "CombinerStructs.h"
+#include "GBIDefs.h"
 
 //Forward declarations
-struct TexEnvCombiner;
-struct CombineCycle;
-struct CombinerStage;
-struct Combiner;
 class AdvancedTexEnvCombiner;
-class CombinerCache;
 class CombinerBase;
+class CombinerCache;
+struct CombineCycle;
+struct Combiner;
+struct CombinerStage;
+struct TexEnvCombiner;
 
 //*****************************************************************************
 //! Advanced Texture Environment Combiner

src/Combiner/AdvancedTexEnvCombiner.cpp

@@ -20,11 +20,12 @@
  *****************************************************************************/
 
 #include <algorithm>
+
 using std::max;
 #include "AdvancedTexEnvCombiner.h"
 #include "CombinerStructs.h"
-#include "MultiTexturingExt.h"    //glActiveTextureARB
 #include "ExtensionChecker.h"
+#include "MultiTexturingExt.h"    //glActiveTextureARB
 
 #ifndef GL_ATI_texture_env_combine3
 #define GL_ATI_texture_env_combine3
@@ -81,9 +82,9 @@ static TexEnvCombinerArg TexEnvArgs[] =
     { GL_CONSTANT_ARB,       GL_SRC_COLOR },
     // K5
     { GL_CONSTANT_ARB,       GL_SRC_COLOR },
-    // ONE
+    // CB_ONE
     { GL_CONSTANT_ARB,       GL_SRC_COLOR },
-    // ZERO
+    // CB_ZERO
     { GL_CONSTANT_ARB,       GL_SRC_COLOR }
 };
 
@@ -123,8 +124,8 @@ void AdvancedTexEnvCombiner::initialize()
 
     if ( ATI_texture_env_combine3 )
     {
-        TexEnvArgs[ONE].source  = GL_ONE;
-        TexEnvArgs[ZERO].source = GL_ZERO;
+        TexEnvArgs[CB_ONE].source  = GL_ONE;
+        TexEnvArgs[CB_ZERO].source = GL_ZERO;
     }
 }
 
@@ -273,7 +274,7 @@ TexEnvCombiner* AdvancedTexEnvCombiner::createNewTextureEnviroment(Combiner* col
                 sb = m_primColor[3];
             else if (alphaCombiner->stage[i].op[j].param1 == ENV_ALPHA)
                 sb = m_envColor[3];
-            else if (alphaCombiner->stage[i].op[j].param1 == ONE)
+            else if (alphaCombiner->stage[i].op[j].param1 == CB_ONE)
                 sb = 1.0f;
 
             if (((alphaCombiner->stage[i].numOps - j) >= 3) &&
@@ -286,7 +287,7 @@ TexEnvCombiner* AdvancedTexEnvCombiner::createNewTextureEnviroment(Combiner* col
                 envCombiner->usesT0 |= alphaCombiner->stage[i].op[j].param1 == TEXEL0_ALPHA;
                 envCombiner->usesT1 |= alphaCombiner->stage[i].op[j].param1 == TEXEL1_ALPHA;
 
-                if (alphaCombiner->stage[i].op[j].param1 == ONE)
+                if (alphaCombiner->stage[i].op[j].param1 == CB_ONE)
                 {
                     SetAlphaCombinerValues( curUnit, arg0, envCombiner->alpha[curUnit].arg0.source, GL_ONE_MINUS_SRC_ALPHA );
                 }
@@ -342,7 +343,7 @@ TexEnvCombiner* AdvancedTexEnvCombiner::createNewTextureEnviroment(Combiner* col
                             (alphaCombiner->stage[i].op[j].param1 == TEXEL1_ALPHA) && (curUnit == 0))
                             curUnit++;
 
-                        if ((j > 0) && (alphaCombiner->stage[i].op[j-1].op == LOAD) && (alphaCombiner->stage[i].op[j-1].param1 == ONE))
+                        if ((j > 0) && (alphaCombiner->stage[i].op[j-1].op == LOAD) && (alphaCombiner->stage[i].op[j-1].param1 == CB_ONE))
                         {
                             SetAlphaCombinerArg( curUnit, arg0, alphaCombiner->stage[i].op[j].param1 );
                             envCombiner->alpha[curUnit].arg0.operand = GL_ONE_MINUS_SRC_ALPHA;
@@ -481,7 +482,7 @@ TexEnvCombiner* AdvancedTexEnvCombiner::createNewTextureEnviroment(Combiner* col
                             ((colorCombiner->stage[i].op[j].param1 == TEXEL1) || (colorCombiner->stage[i].op[j].param1 == TEXEL1_ALPHA)) && (curUnit == 0))
                             curUnit++;
 
-                        if ((j > 0) && (colorCombiner->stage[i].op[j-1].op == LOAD) && (colorCombiner->stage[i].op[j-1].param1 == ONE))
+                        if ((j > 0) && (colorCombiner->stage[i].op[j-1].op == LOAD) && (colorCombiner->stage[i].op[j-1].param1 == CB_ONE))
                         {
                             SetColorCombinerArg( curUnit, arg0, colorCombiner->stage[i].op[j].param1 );
                             envCombiner->color[curUnit].arg0.operand = GL_ONE_MINUS_SRC_COLOR;

src/Combiner/AdvancedTexEnvCombiner.h

@@ -25,6 +25,7 @@
 #include "CombinerBase.h"
 #include "CombinerStructs.h"
 
+class AdvancedTexEnvCombiner;
 struct TexEnvCombiner;
 
 #ifndef GL_ARB_texture_env_combine

src/Combiner/CombinerBase.cpp

@@ -20,6 +20,7 @@
  *****************************************************************************/
 
 #include "CombinerBase.h"
+
 #include "CombinerStructs.h"
 
 //-----------------------------------------------------------------------------
@@ -109,14 +110,14 @@ void CombinerBase::setEnvColor(float r, float g, float b, float a)
 //!    \arg \c PRIMITIVE_ALPHA Get color from primatives alpha value
 //!    \arg \c ENV_ALPHA Get color from environment colors alpha value
 //!    \arg \c PRIM_LOD_FRAC Get color from primative-LOD-frac value
-//!    \arg \c ONE Get white color
-//!    \arg \c ZERO Get black color
+//!    \arg \c CB_ONE Get white color
+//!    \arg \c CB_ZERO Get black color
 //! @param[in] alphaSource From which alphasource to retrive alpha value
 //!    \arg \c PRIMITIVE_ALPHA Get alpha value from primitive colors alpha value
 //!    \arg \c ENV_ALPHA Get alpha value from environment colors alpha value
 //!    \arg \c PRIM_LOD_FRAC Get alpha value from primative-LOD-frac value
-//!    \arg \c ONE Set alpha value to 1.0
-//!    \arg \c ZERO Set alpha value to 0.0
+//!    \arg \c CB_ONE Set alpha value to 1.0
+//!    \arg \c CB_ZERO Set alpha value to 0.0
 //! @param[out] out The combiner color with color and alpha value
 //-----------------------------------------------------------------------------
 void CombinerBase::getCombinerColor(float out[4], short colorSrc, short alphaSrc)
@@ -149,12 +150,12 @@ void CombinerBase::getCombinerColor(float out[4], short colorSrc, short alphaSrc
             out[1] = m_primLodFrac; 
             out[2] = m_primLodFrac; 
             break; 
-        case ONE: 
+        case CB_ONE: 
             out[0] = 1.0f; 
             out[1] = 1.0f; 
             out[2] = 1.0f; 
             break; 
-        case ZERO: 
+        case CB_ZERO: 
             out[0] = 0.0f; 
             out[1] = 0.0f; 
             out[2] = 0.0f; 
@@ -173,10 +174,10 @@ void CombinerBase::getCombinerColor(float out[4], short colorSrc, short alphaSrc
         case PRIM_LOD_FRAC: 
             out[3] = m_primLodFrac; 
             break; 
-        case ONE: 
+        case CB_ONE: 
             out[3] = 1.0f; 
             break; 
-        case ZERO: 
+        case CB_ZERO: 
             out[3] = 0.0f; 
             break; 
     } 

src/Combiner/CombinerCache.cpp

@@ -21,6 +21,8 @@
 
 #include "CombinerCache.h"
 
+#include "CombinerStructs.h"
+
 //-----------------------------------------------------------------------------
 //* New Compiled Combiner
 //! Function used to add decoded mux values and the result of them to the list.

src/Combiner/CombinerCache.h

@@ -22,9 +22,12 @@
 #ifndef COMBINER_CACHE_H_
 #define COMBINER_CACHE_H_
 
-#include "CombinerStructs.h"
 #include <list>
 
+#include "CombinerStructs.h"
+
+struct TexEnvCombiner;
+
 //*****************************************************************************
 //* Cached Combiner
 //! Struct used to store decoded mux values and the result of them

src/Combiner/CombinerStageCreator.cpp

@@ -28,6 +28,8 @@
 
 #include "CombinerStageCreator.h"
 
+#include "CombinerStructs.h"
+
 //-----------------------------------------------------------------------------
 //* Set Stage
 //! Function used to set combiner stage, tries to simplify and optimize as 
@@ -44,10 +46,10 @@ void setStage(CombineCycle* combineCycle, CombinerStage* stageOut)
     stageOut->numOps = 1;
 
     // If we're just subtracting zero, skip it
-    if (combineCycle->subValue != ZERO)
+    if (combineCycle->subValue != CB_ZERO)
     {
         if (combineCycle->subValue == stageOut->op[0].param1)
-            stageOut->op[0].param1 = ZERO;
+            stageOut->op[0].param1 = CB_ZERO;
         else
         {
             //Subract operation
@@ -58,17 +60,17 @@ void setStage(CombineCycle* combineCycle, CombinerStage* stageOut)
     }
 
     //Multiply operation
-    if ((stageOut->numOps > 1) || (stageOut->op[0].param1 != ZERO))
+    if ((stageOut->numOps > 1) || (stageOut->op[0].param1 != CB_ZERO))
     {
-        if (combineCycle->multValue == ZERO)
+        if (combineCycle->multValue == CB_ZERO)
         {
             stageOut->numOps = 1;
             stageOut->op[0].op = LOAD;
-            stageOut->op[0].param1 = ZERO;
+            stageOut->op[0].param1 = CB_ZERO;
         }
         else
         {
-            if ( stageOut->numOps == 1 && stageOut->op[0].param1 == ONE )
+            if ( stageOut->numOps == 1 && stageOut->op[0].param1 == CB_ONE )
             {
                 //LOAD
                 stageOut->op[0].param1 = combineCycle->multValue;
@@ -84,10 +86,10 @@ void setStage(CombineCycle* combineCycle, CombinerStage* stageOut)
     }
 
     //Don't bother adding zero
-    if (combineCycle->addValue != ZERO)
+    if (combineCycle->addValue != CB_ZERO)
     {
             // If all we have so far is zero, then load this instead
-        if ((stageOut->numOps == 1) && (stageOut->op[0].param1 == ZERO))
+        if ((stageOut->numOps == 1) && (stageOut->op[0].param1 == CB_ZERO))
         {
             stageOut->op[0].param1 = combineCycle->addValue;
         }

src/Combiner/CombinerStageCreator.h

@@ -24,6 +24,9 @@
 
 #include "CombinerStructs.h"
 
+struct CombineCycle;
+struct CombinerStage;
+
 //Function used to set combiner stage
 void setStage(CombineCycle* combineCycle, CombinerStage* stageOut);
 

src/Combiner/CombinerStructs.h

@@ -22,8 +22,8 @@
 #ifndef COMBINER_STRUCTS_H_
 #define COMBINER_STRUCTS_H_
 
-#include "m64p.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 // Internal combiner commands
 #define LOAD        0
@@ -53,8 +53,8 @@
 #define NOISE           16
 #define K4              17
 #define K5              18
-#define ONE             19
-#define ZERO            20
+#define CB_ONE          19
+#define CB_ZERO         20
 
 //* Combiner data
 //! Defines how mux-values are coded.

src/Combiner/DummyCombiner.cpp

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "DummyCombiner.h"
 #include "CombinerStructs.h"
+#include "DummyCombiner.h"
 #include "ExtensionChecker.h"
 #include "MultiTexturingExt.h"
 

src/Combiner/SimpleTexEnvCombiner.cpp

@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "SimpleTexEnvCombiner.h"
 #include "CombinerStructs.h"
-#include "MultiTexturingExt.h"
 #include "ExtensionChecker.h"
-#include "m64p.h"
+#include "MultiTexturingExt.h"
 #include "OpenGL.h"
+#include "SimpleTexEnvCombiner.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor
@@ -172,7 +172,7 @@ TexEnvCombiner* SimpleTexEnvCombiner::createNewTextureEnviroment(Combiner* color
                     if (op->param1 == TEXEL0 || op->param1 == TEXEL0_ALPHA)
                     {
                         if ( mode == GL_MODULATE )
-                            m_color = ONE;
+                            m_color = CB_ONE;
 
                         m_usesTexture0 = true;
                         m_usesTexture1 = false;
@@ -180,7 +180,7 @@ TexEnvCombiner* SimpleTexEnvCombiner::createNewTextureEnviroment(Combiner* color
                     else if ( op->param1 == TEXEL1 || op->param1 == TEXEL1_ALPHA )
                     {
                         if ( mode == GL_MODULATE )
-                            m_color = ONE;
+                            m_color = CB_ONE;
 
                         m_usesTexture0 = false;
                         m_usesTexture1 = true;

src/Combiner/SimpleTexEnvCombiner.h

@@ -22,14 +22,15 @@
 #ifndef SIMPLE_TEX_ENV_COMBINER_H_
 #define SIMPLE_TEX_ENV_COMBINER_H_
 
-#include "GBIDefs.h"
-#include "CombinerStructs.h"
 #include "CombinerBase.h"
+#include "CombinerStructs.h"
+#include "GBIDefs.h"
 
 //Forward declarations
 struct CombineCycle;
-struct CombinerStage;
 struct Combiner;
+struct CombinerStage;
+struct TexEnvCombiner;
 
 //*****************************************************************************
 //! Simple Texture Environment Combiner

src/DisplayListParser.cpp

@@ -20,12 +20,14 @@
  *****************************************************************************/
 
 #include "DisplayListParser.h"
-#include "Memory.h"
+
 #include "GBI.h"
-#include "RSP.h"
-#include "RDP.h"
-#include "OpenGLRenderer.h"
 #include "GBIDefs.h"
+#include "Memory.h"
+#include "OpenGLRenderer.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "UCodeDefs.h"
 
 //-----------------------------------------------------------------------------
 //* Task

src/ExtensionChecker.cpp

@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "m64p.h"
-#include "OpenGL.h"
+#include <string.h>
+
 #include "ExtensionChecker.h"
+#include "OpenGL.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Is Extension Supported

src/FogManager.cpp

@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "FogManager.h"
 #include "ExtensionChecker.h"
-#include "m64p.h"
+#include "FogManager.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 #ifndef GL_GLEXT_VERSION
     //-----------------------------------------------------------------------------

src/GBI/GBI.cpp

@@ -20,14 +20,18 @@
  *****************************************************************************/
 
 #include "GBI.h"
+
 #include "GBIDefs.h"
-#include "RSP.h"
-#include "RDP.h"
-#include "UCodeSelector.h"
-#include "UCodeIdentificationData.h"
-#include "OpenGLManager.h"
 #include "Logger.h"
+#include "OpenGLManager.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "UCodeIdentificationData.h"
+#include "UCodeSelector.h"
 #include "m64p.h"
+#include "m64p_types.h"
+
+class DisplayListParser;
 
 //-----------------------------------------------------------------------------
 //! Static Variables

src/GBI/GBI.h

@@ -23,21 +23,22 @@
 #define GRAPHIC_BINARY_INTERFACE_H_
 
 
-#include "UCodeDefs.h"
+#include "RDPInstructions.h"
 #include "UCode0.h"     //Super Mario 64
 #include "UCode1.h"     //Games like Mario Kart 64, Starfox 64
+#include "UCode10.h"    //Conker Bad Fur Day
 #include "UCode2.h"     //Golden Eye
 #include "UCode4.h"     //Wave Race 64
 #include "UCode5.h"     //Newer Games
 #include "UCode6.h"     //Diddy Kong Racing
 #include "UCode7.h"     //Yoshi's Story
 #include "UCode9.h"     //Perfect Dark
-#include "UCode10.h"    //Conker Bad Fur Day
-#include "RDPInstructions.h"
+#include "UCodeDefs.h"
 
-class RSP;
-class RDP;
+class DisplayListParser;
 class Memory;
+class RDP;
+class RSP;
 class UCodeSelector;
 
 // Allows easier setting of GBI commands

src/GraphicsPlugin.cpp

@@ -20,20 +20,26 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "GraphicsPlugin.h"
-#include "VI.h"                  //Video interface
-#include "Memory.h"              //Access to memory (RDRAM, Texture Memory)
-#include "OpenGLRenderer.h"      //Renderer
-#include "FrameBuffer.h"         //Framebuffer
+#include <sys/time.h>
+#include <ctime>
+
+#include "ConfigMap.h"           //Configuration
 #include "DisplayListParser.h"   //Displaylist parser
 #include "FogManager.h"          //Fog 
-#include "RSP.h"                 //Reality Signal Processor
-#include "RDP.h"                 //Reality Drawing Processor
+#include "FrameBuffer.h"         //Framebuffer
 #include "GBI.h"                 //Graphics Binary Interface 
-#include "ConfigMap.h"           //Configuration
+#include "GraphicsPlugin.h"
 #include "Logger.h"              //Debug logger
+#include "Memory.h"              //Access to memory (RDRAM, Texture Memory)
+#include "OpenGL.h"
+#include "OpenGLManager.h"
+#include "OpenGLRenderer.h"      //Renderer
+#include "RDP.h"                 //Reality Drawing Processor
+#include "RSP.h"                 //Reality Signal Processor
 #include "RomDetector.h"
-#include <ctime>
+#include "VI.h"                  //Video interface
+#include "m64p.h"
+#include "m64p_types.h"
 
 //FrameBuffer framebuffer01;
 //FrameBuffer framebuffer02;

src/GraphicsPlugin.h

@@ -23,18 +23,21 @@
 #ifndef GRAPHICS_PLUGIN_H_
 #define GRAPHICS_PLUGIN_H_
 
-#include "TextureCache.h"
+#include "GBI.h"
 #include "OpenGLManager.h"         //Initializes OpenGL and handles OpenGL states
-#include "RSP.h"
 #include "RDP.h"
+#include "RSP.h"
+#include "TextureCache.h"
+#include "m64p_plugin.h"
 
 //Forward declarations
-//struct GFX_INFO;
-class VI;
-class Memory;
 class DisplayListParser;
 class FogManager;
+class Memory;
+class OpenGLManager;
 class ROMDetector;
+//struct GFX_INFO;
+class VI;
 struct ConfigMap;
 
 //*****************************************************************************

src/MultiTexturingExt.cpp

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "MultiTexturingExt.h"
 #include "ExtensionChecker.h"
+#include "MultiTexturingExt.h"
 
 
 //Multi Texturing functions

src/MultiTexturingExt.h

@@ -23,8 +23,8 @@
 #ifndef MULTI_TEXTURING_EXTENSION_H_
 #define MULTI_TEXTURING_EXTENSION_H_
 
-#include "m64p.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 #ifndef GL_GLEXT_VERSION
     //Multi Texturing Definitions

src/OpenGLManager.cpp

@@ -20,7 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
+#include <stddef.h>
+
 #include "OpenGLManager.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor

src/OpenGLManager.h

@@ -23,9 +23,9 @@
 #ifndef OPEN_GL_Manager_H_
 #define OPEN_GL_Manager_H_
 
+#include "OpenGL.h"
 //OpenGL includes
 #include "m64p.h"
-#include "OpenGL.h"
 
 //*****************************************************************************
 //* OpenGL Manager Class                                                        

src/RDP/RDP.cpp

@@ -19,26 +19,31 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RDP.h"
-#include "GBIDefs.h"
-#include "GBI.h"
-#include "RSP.h"
-#include "DisplayListParser.h"
-#include "assembler.h"
-#include "OpenGLRenderer.h"
-#include "TextureCache.h"
-#include "VI.h"
-#include "Memory.h"
-#include "OpenGLManager.h"
-#include "OpenGL2DRenderer.h"
+#include <algorithm>
+
 #include "AdvancedCombinerManager.h"
+#include "CachedTexture.h"
+#include "DisplayListParser.h"
 #include "FogManager.h"
+#include "GBI.h"
+#include "GBIDefs.h"
 #include "Logger.h"
 #include "MathLib.h"
-#include "RomDetector.h"
-#include "m64p.h"
+#include "Memory.h"
+#include "N64Games.h"
 #include "OpenGL.h"
-#include <algorithm>
+#include "OpenGL2DRenderer.h"
+#include "OpenGLManager.h"
+#include "OpenGLRenderer.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "RomDetector.h"
+#include "TextureCache.h"
+#include "VI.h"
+#include "assembler.h"
+#include "m64p.h"
+#include "m64p_types.h"
+
 using std::max;
 
 //-----------------------------------------------------------------------------

src/RDP/RDP.h

@@ -24,22 +24,23 @@
 
 //Includes
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p_plugin.h"
-#include "UCodeDefs.h"
 #include "GBI.h"
 #include "GBIDefs.h"
 #include "TextureLoader.h"
+#include "UCodeDefs.h"
+#include "m64p_plugin.h"
 
 //Forward declaration
-class RSP;
-class VI;
-class Memory;
-class DisplayListParser;
-class TextureCache;
 class AdvancedCombinerManager;
+class DisplayListParser;
 class FogManager;
-class TextureLoader;
+class GBI;
+class Memory;
 class OpenGL2DRenderer;
+class RSP;
+class TextureCache;
+class TextureLoader;
+class VI;
 
 //*****************************************************************************
 //! RDPSetImgInfo

src/RDP/RDPInstructions.cpp

@@ -19,11 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RDPInstructions.h"
-#include "RDPUCodeStructs.h"
-#include "RDP.h"
 #include "DisplayListParser.h"
 #include "Logger.h"
+#include "RDP.h"
+#include "RDPInstructions.h"
+#include "RDPUCodeStructs.h"
+#include "m64p_types.h"
 
 //-----------------------------------------------------------------------------
 // Static Variables

src/RSP/RSP.cpp

@@ -19,21 +19,24 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RSP.h"
-#include "../UCodeDefs.h"
-#include "../RDP/RDP.h"
 #include <cmath>
-#include "GBIDefs.h"
-#include "VI.h"
-#include "Memory.h"
-#include "Logger.h"
-#include "OpenGLRenderer.h"
-#include "OpenGLManager.h"
-#include "RSPLightManager.h"
-#include "FogManager.h"
+
+#include "../RDP/RDP.h"
+#include "../UCodeDefs.h"
 #include "DisplayListParser.h"
+#include "FogManager.h"
+#include "GBI.h"
+#include "GBIDefs.h"
+#include "Logger.h"
 #include "MathLib.h"
-#include "MathLib.h"
+#include "Memory.h"
+#include "OpenGLManager.h"
+#include "OpenGLRenderer.h"
+#include "RSP.h"
+#include "RSPLightManager.h"
+#include "RSPMatrixManager.h"
+#include "VI.h"
+#include "m64p_types.h"
 
 #define MI_INTR_SP                 0x00000001  //!< RSP Interrupt signal
 

src/RSP/RSP.h

@@ -23,20 +23,21 @@
 #define REALITY_SIGNAL_PROCESSOR_H_
 
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p_plugin.h"
-#include "UCodeDefs.h"
+#include "Matrix4.h"
 #include "RSPMatrixManager.h"
 #include "RSPVertexManager.h"
-#include "Matrix4.h"
+#include "UCodeDefs.h"
+#include "m64p_plugin.h"
 
 //Forward declarations
+class DisplayListParser;
+class FogManager;
+class Memory;
+class RDP;
+class RSPLightManager;
+class RSPMatrixManager;
 class VI;
 struct RDPTile;
-class RDP;
-class Memory;
-class DisplayListParser;
-class RSPLightManager;
-class FogManager;
 
 //-----------------------------------------------------------------------------
 // Defines

src/RSP/RSPLightManager.cpp

@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RSPLightManager.h"
-#include "Memory.h"
-#include "MathLib.h"
 #include "GBI.h"
 #include "Logger.h"
+#include "MathLib.h"
+#include "Memory.h"
+#include "RSPLightManager.h"
 
 #define RGBA_GETALPHA(rgb)      ((rgb) >> 24)
 #define RGBA_GETRED(rgb)        (((rgb) >> 16) & 0xff)

src/RSP/RSPMatrixManager.cpp

@@ -19,11 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RSPMatrixManager.h"
-#include "Memory.h"
 #include <cmath>      //modff
+
 #include "GBI.h"      //SHIFT
 #include "GBIDefs.h"  //_FIXED2FLOAT
+#include "Memory.h"
+#include "RSPMatrixManager.h"
+
 //-----------------------------------------------------------------------------
 //! Constructor
 //-----------------------------------------------------------------------------

src/RSP/RSPVertexManager.cpp

@@ -19,16 +19,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RSPVertexManager.h"
-#include "OpenGLManager.h"
-#include "Memory.h"
-#include "RSPMatrixManager.h"
-#include "RSPLightManager.h"
-#include "OpenGLRenderer.h"
-#include "GBIDefs.h"   //hmm
-#include "MathLib.h"   //Transform, Vec3Normalize
 #include <cmath> //sqrt
+
+#include "GBI.h"
+#include "GBIDefs.h"   //hmm
 #include "Logger.h"
+#include "MathLib.h"   //Transform, Vec3Normalize
+#include "Memory.h"
+#include "OpenGL.h"
+#include "OpenGLManager.h"
+#include "OpenGLRenderer.h"
+#include "RSPLightManager.h"
+#include "RSPMatrixManager.h"
+#include "RSPVertexManager.h"
+#include "m64p_types.h"
 
 //Vertex
 struct Vertex

src/RomDetector.cpp

@@ -19,10 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RomDetector.h"
-#include "assembler.h"   //swapRomHeaderBytes
 #include <string.h>      //memcpy
+
+#include "RomDetector.h"
 #include "StringFunctions.h"
+#include "assembler.h"   //swapRomHeaderBytes
 
 //-----------------------------------------------------------------------------
 //! Constructor

src/SecondaryColorExt.cpp

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "SecondaryColorExt.h"
 #include "ExtensionChecker.h"
+#include "SecondaryColorExt.h"
 
 // EXT_secondary_color functions
 #ifndef GL_GLEXT_VERSION

src/SecondaryColorExt.h

@@ -23,8 +23,8 @@
 #ifndef SECONDARY_COLOR_EXTENSION_H_
 #define SECONDARY_COLOR_EXTENSION_H_
 
-#include "m64p.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 #ifndef GL_GLEXT_VERSION
     #ifndef GL_EXT_secondary_color

src/VI.cpp

@@ -19,8 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "VI.h"
+#include "GBI.h"
 #include "GBIDefs.h" //_FIXED2FLOAT, _SHIFTR
+#include "VI.h"
 #include "m64p.h"
 
 //-----------------------------------------------------------------------------

src/config/Config.cpp

@@ -20,10 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "Config.h"
 #include <cstdio> 
+
+#include "Config.h"
 #include "GraphicsPlugin.h"
 #include "Logger.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor

src/config/Config.h

@@ -23,8 +23,9 @@
 #ifndef CONFIG_H_
 #define CONFIG_H_
 
-#include "m64p.h"
 #include "ConfigMap.h"
+#include "m64p.h"
+#include "m64p_types.h"
 
 //Forward declaration
 class GraphicsPlugin;

src/config/StringFunctions.cpp

@@ -19,8 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "StringFunctions.h"
+#include <ctype.h>
 #include <cstring>
+
+#include "StringFunctions.h"
+
 using std::string;
 using std::vector;
 

src/config/StringFunctions.h

@@ -64,10 +64,11 @@ in binary (= untranslated) mode and check for the different newlines yourself.
 #ifndef STRING_FUNCTIONS_H_
 #define STRING_FUNCTIONS_H_
 
+#include <ctype.h>
+#include <stddef.h>
+#include <algorithm>  //std::transform
 #include <string>
 #include <vector>
-#include <ctype.h>
-#include <algorithm>  //std::transform
     
 namespace StringFunctions 
 {

src/config/StringValue.h

@@ -22,8 +22,8 @@
 #ifndef STRING_VALUE_H_
 #define STRING_VALUE_H_
 #include <cstdlib>
-#include <string>
 #include <sstream>
+#include <string>
 
 //! Represents numeric value(s) with a string using conversion operators 
 struct StringValue

src/framebuffer/FrameBuffer.cpp

@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
+#include <string.h>
+
 #include "FrameBuffer.h"
-#include "m64p.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 #ifndef GL_GLEXT_VERSION
     //-----------------------------------------------------------------------------

src/log/Logger.h

@@ -24,6 +24,7 @@
 #define LOGGER_H_
 
 #include <cstdlib>
+
 #include "m64p_types.h"
 
 //*****************************************************************************

src/m64p.h

@@ -32,9 +32,9 @@
 #endif
 
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p_types.h"
-#include "m64p_plugin.h"
 #include "m64p_config.h"
+#include "m64p_plugin.h"
+#include "m64p_types.h"
 #include "m64p_vidext.h"
 
 /* definitions of pointers to Core config functions */

src/main.cpp

@@ -22,18 +22,21 @@
 
 //Includes
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p.h"
+#include <stdio.h>
+#include <string.h>
+
+#include "ConfigMap.h"
 #include "GraphicsPlugin.h"        //Main class
-#include "config/Config.h"         //Configuration   
 #include "Logger.h"                //Debug logger
 #include "MemoryLeakDetector.h"    //For detecting memory leaks
-
-#include "m64p_types.h"
+#include "OpenGLManager.h"
+#include "config/Config.h"         //Configuration   
+#include "m64p.h"
 #include "m64p_common.h"
-#include "m64p_plugin.h"
 #include "m64p_config.h"
+#include "m64p_plugin.h"
+#include "m64p_types.h"
 #include "m64p_vidext.h"
-
 #include "osal_dynamiclib.h"
 
 //Definitions

src/math/MathLib.h

@@ -23,6 +23,7 @@
 #define MATH_LIBRARY_H_
 
 #include <cmath>     //sqrtf
+
 #include "m64p.h"  
 
 // Formula: a.b = a0*b0 + a1*b1 + a2*b2

src/math/Matrix4.h

@@ -22,6 +22,7 @@
 #ifndef MATRIX_4_H_
 #define MATRIX_4_H_
 
+#include <stddef.h>
 #include <iostream>
 #include <ostream>
 

src/osal_dynamiclib_unix.cpp

@@ -19,9 +19,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "m64p_types.h"
 #include "osal_dynamiclib.h"

src/osal_dynamiclib_win32.cpp

@@ -19,9 +19,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <windows.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
 
 #include "m64p_types.h"
 #include "osal_dynamiclib.h"

src/renderer/OpenGL2DRenderer.cpp

@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
+#include "OpenGL.h"
 #include "OpenGL2DRenderer.h"
 #include "VI.h"
 #include "m64p.h"
-#include "OpenGL.h"
 
 //-----------------------------------------------------------------------------
 //* Initialize

src/renderer/OpenGLRenderer.cpp

@@ -20,23 +20,29 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "m64p.h"
-
-#include <cmath>
 #include <algorithm>
-#include "OpenGLRenderer.h"
-#include "OpenGLManager.h"
-#include "RSP.h"
-#include "RDP.h"
-#include "TextureCache.h"
-#include "VI.h"
-#include "Logger.h"
+#include <cmath>
+
 //#include "CombinerManager.h"
 #include "AdvancedCombinerManager.h"
-#include "FogManager.h"
+#include "CachedTexture.h"
 #include "ExtensionChecker.h"
+#include "FogManager.h"
+#include "GBIDefs.h"
+#include "Logger.h"
 #include "MultiTexturingExt.h"
+#include "OpenGL.h"
+#include "OpenGLManager.h"
+#include "OpenGLRenderer.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "RSPVertexManager.h"
 #include "SecondaryColorExt.h"
+#include "TextureCache.h"
+#include "TextureLoader.h"
+#include "VI.h"
+#include "m64p.h"
+#include "m64p_types.h"
 
 
 using std::max;

src/renderer/OpenGLRenderer.h

@@ -22,18 +22,17 @@
 #ifndef OPEN_GL_RENDERER_H_
 #define OPEN_GL_RENDERER_H_
 
-#include "m64p.h"
+#include "MultiTexturingExt.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 //Forward Declarations
-struct SPVertex;
-class RSP;
+class FogManager;
 class RDP;
+class RSP;
 class TextureCache;
 class VI;
-class FogManager;
-
-#include "MultiTexturingExt.h"
+struct SPVertex;
 
 
 //*****************************************************************************

src/texture/CachedTexture.cpp

@@ -21,8 +21,8 @@
 
 #include "CachedTexture.h"
 
-#include "m64p.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor

src/texture/ImageFormatSelector.cpp

@@ -26,13 +26,13 @@
 //
 //*****************************************************************************
 
-#include "ImageFormatSelector.h"
 #include "CachedTexture.h"
-#include "assembler.h"
 #include "GBIDefs.h"
-#include "m64p.h"
-#include "OpenGL.h"
+#include "ImageFormatSelector.h"
 #include "Memory.h"
+#include "OpenGL.h"
+#include "assembler.h"
+#include "m64p.h"
 
 #ifndef GL_EXT_packed_pixels
 #define GL_EXT_packed_pixels                 1

src/texture/TextureCache.cpp

@@ -19,27 +19,32 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "TextureCache.h"
+#include <algorithm>
 
+#include "CachedTexture.h"
+#include "GBIDefs.h"
+#include "MathLib.h"
+#include "OpenGL.h"
 #include "RDP.h"
 #include "RSP.h"
-#include "CachedTexture.h"
-#include "MathLib.h"
-#include <algorithm>
+#include "TextureCache.h"
+#include "TextureLoader.h"
+
     using std::min;
-#include "m64p.h"
-#include "OpenGL.h"
 #include "Memory.h"
-#include "OpenGLRenderer.h"
 #include "MultiTexturingExt.h"    
+#include "OpenGLRenderer.h"
+#include "m64p.h"
+
     //gSPBgRect1Cyc
 //gSPBgRectCopy
 #define GL_CLAMP_TO_EDGE                  0x812F
 #define GL_GENERATE_MIPMAP                0x8191
 
-#include "Logger.h"
 #include <iostream>
 
+#include "Logger.h"
+
 //-----------------------------------------------------------------------------
 //! Constructor
 //-----------------------------------------------------------------------------

src/texture/TextureCache.h

@@ -22,15 +22,17 @@
 #ifndef TEXTURE_CACHE_H_
 #define TEXTURE_CACHE_H_
 
-#include "CachedTexture.h"
-#include "CRCCalculator2.h"
-#include "ImageFormatSelector.h"
 #include <list>
 
+#include "CRCCalculator2.h"
+#include "CachedTexture.h"
+#include "ImageFormatSelector.h"
+
 //Forward declarations
+class CachedTexture;
 class Memory;
-class RSP;
 class RDP;
+class RSP;
 
 //*****************************************************************************
 //* Texture Cache

src/texture/TextureLoader.cpp

@@ -19,14 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "TextureLoader.h"
-#include "Memory.h"
-#include "TextureCache.h"
-#include "GBIDefs.h"
-#include "assembler.h"
-#include "Logger.h"
-#include "RDP.h"
 #include "CRCCalculator2.h"
+#include "GBI.h"
+#include "GBIDefs.h"
+#include "Logger.h"
+#include "Memory.h"
+#include "RDP.h"
+#include "TextureCache.h"
+#include "TextureLoader.h"
+#include "assembler.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor

src/ucodes/UCode0.cpp

@@ -19,15 +19,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "UCode0.h"
+#include "DisplayListParser.h"
 #include "GBI.h"
-#include "RSP.h"
-#include "RDP.h"
-#include "Memory.h"
-#include "UCodeDefs.h"
 #include "GBIDefs.h"
 #include "Logger.h"
-#include "DisplayListParser.h"
+#include "Memory.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "UCode0.h"
+#include "UCodeDefs.h"
+#include "m64p_types.h"
 
 //-----------------------------------------------------------------------------
 // Static Variables

src/ucodes/UCode1.cpp

@@ -19,18 +19,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "UCode1.h"
-#include "UCode0.h"
-
-//Forward declaration
 #include "GBI.h"
-#include "RSP.h"
-#include "RDP.h"
-#include "Memory.h"
-
-#include "UCodeDefs.h"
 #include "GBIDefs.h"
 #include "Logger.h"
+#include "Memory.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "UCode0.h"
+#include "UCode1.h"
+#include "UCodeDefs.h"
+#include "m64p_types.h"
 
 //-----------------------------------------------------------------------------
 // Static Variables

src/ucodes/UCode10.cpp

@@ -19,18 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "UCode10.h"
-#include "UCode5.h"
-
-//Forward declaration
-#include "GBI.h"
-#include "RSP.h"
-#include "RDP.h"
-#include "Memory.h"
 #include "DisplayListParser.h"
-#include "UCodeDefs.h"
+#include "GBI.h"
 #include "GBIDefs.h"
 #include "Logger.h"
+#include "Memory.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "RSPVertexManager.h"
+#include "UCode10.h"
+#include "UCode5.h"
+#include "UCodeDefs.h"
 
 
 #define CONKER_BFD_ADD_VERTICES 1   /*F3DEX2_VTX ?*/ 

src/ucodes/UCode2.cpp

@@ -19,16 +19,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "UCode2.h"
-#include "UCode0.h"
+#include "DisplayListParser.h"
 #include "GBI.h"
-#include "RSP.h"
-#include "RDP.h"
-#include "UCodeDefs.h"
 #include "GBIDefs.h"
 #include "Logger.h"
 #include "Memory.h"
-#include "DisplayListParser.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "UCode0.h"
+#include "UCode2.h"
+#include "UCodeDefs.h"
 
 //-----------------------------------------------------------------------------
 // Static Variables