Add missing includes and forward declarations

src/Combiner/AdvancedCombinerManager.cpp

@@ -20,12 +20,15 @@
  *****************************************************************************/
 
 #include "AdvancedCombinerManager.h"
+
 #include "AdvancedTexEnvCombiner.h"
+#include "CombinerBase.h"
 #include "CombinerStageCreator.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"

src/Combiner/AdvancedCombinerManager.h

@@ -27,13 +27,13 @@
 #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.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"
 
 //-----------------------------------------------------------------------------

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

@@ -26,6 +26,8 @@
 
 #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 

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/SimpleTexEnvCombiner.h

@@ -28,8 +28,9 @@
 
 //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 "GBI.h"
 #include "GBIDefs.h"
 #include "Memory.h"
 #include "OpenGLRenderer.h"
 #include "RDP.h"
 #include "RSP.h"
+#include "UCodeDefs.h"
 
 //-----------------------------------------------------------------------------
 //* Task

src/ExtensionChecker.cpp

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
+#include <string.h>
+
 #include "ExtensionChecker.h"
 #include "OpenGL.h"
 #include "m64p.h"

src/GBI/GBI.cpp

@@ -20,6 +20,7 @@
  *****************************************************************************/
 
 #include "GBI.h"
+
 #include "GBIDefs.h"
 #include "Logger.h"
 #include "OpenGLManager.h"
@@ -28,6 +29,9 @@
 #include "UCodeIdentificationData.h"
 #include "UCodeSelector.h"
 #include "m64p.h"
+#include "m64p_types.h"
+
+class DisplayListParser;
 
 //-----------------------------------------------------------------------------
 //! Static Variables

src/GBI/GBI.h

@@ -35,9 +35,10 @@
 #include "UCode9.h"     //Perfect Dark
 #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,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
+#include <sys/time.h>
 #include <ctime>
 
 #include "ConfigMap.h"           //Configuration
@@ -30,11 +31,15 @@
 #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 "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 "GBI.h"
 #include "OpenGLManager.h"         //Initializes OpenGL and handles OpenGL states
 #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/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/RDP/RDP.cpp

@@ -22,6 +22,7 @@
 #include <algorithm>
 
 #include "AdvancedCombinerManager.h"
+#include "CachedTexture.h"
 #include "DisplayListParser.h"
 #include "FogManager.h"
 #include "GBI.h"
@@ -29,6 +30,7 @@
 #include "Logger.h"
 #include "MathLib.h"
 #include "Memory.h"
+#include "N64Games.h"
 #include "OpenGL.h"
 #include "OpenGL2DRenderer.h"
 #include "OpenGLManager.h"
@@ -40,6 +42,7 @@
 #include "VI.h"
 #include "assembler.h"
 #include "m64p.h"
+#include "m64p_types.h"
 
 using std::max;
 

src/RDP/RDP.h

@@ -31,15 +31,16 @@
 #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

@@ -24,6 +24,7 @@
 #include "RDP.h"
 #include "RDPInstructions.h"
 #include "RDPUCodeStructs.h"
+#include "m64p_types.h"
 
 //-----------------------------------------------------------------------------
 // Static Variables

src/RSP/RSP.cpp

@@ -25,6 +25,7 @@
 #include "../UCodeDefs.h"
 #include "DisplayListParser.h"
 #include "FogManager.h"
+#include "GBI.h"
 #include "GBIDefs.h"
 #include "Logger.h"
 #include "MathLib.h"
@@ -33,7 +34,9 @@
 #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

@@ -30,13 +30,14 @@
 #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/RSPVertexManager.cpp

@@ -21,15 +21,18 @@
 
 #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/VI.cpp

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

src/config/Config.cpp

@@ -25,6 +25,7 @@
 #include "Config.h"
 #include "GraphicsPlugin.h"
 #include "Logger.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor

src/config/Config.h

@@ -25,6 +25,7 @@
 
 #include "ConfigMap.h"
 #include "m64p.h"
+#include "m64p_types.h"
 
 //Forward declaration
 class GraphicsPlugin;

src/config/StringFunctions.cpp

@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
+#include <ctype.h>
 #include <cstring>
 
 #include "StringFunctions.h"

src/config/StringFunctions.h

@@ -65,6 +65,7 @@ in binary (= untranslated) mode and check for the different newlines yourself.
 #define STRING_FUNCTIONS_H_
 
 #include <ctype.h>
+#include <stddef.h>
 #include <algorithm>  //std::transform
 #include <string>
 #include <vector>

src/framebuffer/FrameBuffer.cpp

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

src/main.cpp

@@ -22,9 +22,14 @@
 
 //Includes
 #define M64P_PLUGIN_PROTOTYPES 1
+#include <stdio.h>
+#include <string.h>
+
+#include "ConfigMap.h"
 #include "GraphicsPlugin.h"        //Main class
 #include "Logger.h"                //Debug logger
 #include "MemoryLeakDetector.h"    //For detecting memory leaks
+#include "OpenGLManager.h"
 #include "config/Config.h"         //Configuration   
 #include "m64p.h"
 #include "m64p_common.h"

src/math/Matrix4.h

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

src/renderer/OpenGLRenderer.cpp

@@ -25,18 +25,24 @@
 
 //#include "CombinerManager.h"
 #include "AdvancedCombinerManager.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 "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

@@ -20,6 +20,7 @@
  *****************************************************************************/
 
 #include "CachedTexture.h"
+
 #include "OpenGL.h"
 #include "m64p.h"
 

src/texture/TextureCache.cpp

@@ -22,15 +22,17 @@
 #include <algorithm>
 
 #include "CachedTexture.h"
+#include "GBIDefs.h"
 #include "MathLib.h"
+#include "OpenGL.h"
 #include "RDP.h"
 #include "RSP.h"
 #include "TextureCache.h"
+#include "TextureLoader.h"
 
     using std::min;
 #include "Memory.h"
 #include "MultiTexturingExt.h"    
-#include "OpenGL.h"
 #include "OpenGLRenderer.h"
 #include "m64p.h"
 

src/texture/TextureCache.h

@@ -29,9 +29,10 @@
 #include "ImageFormatSelector.h"
 
 //Forward declarations
+class CachedTexture;
 class Memory;
-class RSP;
 class RDP;
+class RSP;
 
 //*****************************************************************************
 //* Texture Cache

src/texture/TextureLoader.cpp

@@ -20,6 +20,7 @@
  *****************************************************************************/
 
 #include "CRCCalculator2.h"
+#include "GBI.h"
 #include "GBIDefs.h"
 #include "Logger.h"
 #include "Memory.h"

src/ucodes/UCode0.cpp

@@ -28,6 +28,7 @@
 #include "RSP.h"
 #include "UCode0.h"
 #include "UCodeDefs.h"
+#include "m64p_types.h"
 
 //-----------------------------------------------------------------------------
 // Static Variables

src/ucodes/UCode1.cpp

@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-//Forward declaration
 #include "GBI.h"
 #include "GBIDefs.h"
 #include "Logger.h"
@@ -29,6 +28,7 @@
 #include "UCode0.h"
 #include "UCode1.h"
 #include "UCodeDefs.h"
+#include "m64p_types.h"
 
 //-----------------------------------------------------------------------------
 // Static Variables

src/ucodes/UCode10.cpp

@@ -20,13 +20,13 @@
  *****************************************************************************/
 
 #include "DisplayListParser.h"
-//Forward declaration
 #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"

src/ucodes/UCode4.cpp

@@ -26,6 +26,7 @@
 #include "UCode0.h"
 #include "UCode4.h"
 #include "UCodeDefs.h"
+#include "m64p_types.h"
 
 #define F3DWRUS_TRI2        0xB1
 

src/ucodes/UCode5.cpp

@@ -26,9 +26,12 @@
 #include "Memory.h"
 #include "RDP.h"
 #include "RSP.h"
+#include "RSPVertexManager.h"
 #include "UCode0.h"
+#include "UCode1.h"
 #include "UCode5.h"
 #include "UCodeDefs.h"
+#include "m64p_types.h"
 
 
 #define F3DEX2_MTX_STACKSIZE       18

src/ucodes/UCode6.cpp

@@ -27,9 +27,11 @@
 #include "RDP.h"
 #include "RSP.h"
 #include "RSPMatrixManager.h"
+#include "RSPVertexManager.h"
 #include "UCode0.h"
 #include "UCode6.h"
 #include "UCodeDefs.h"
+#include "m64p_types.h"
 
 //-----------------------------------------------------------------------------
 // Static Variables

src/ucodes/UCode7.cpp

@@ -29,6 +29,7 @@
 #include "UCode1.h"
 #include "UCode7.h"
 #include "UCodeDefs.h"
+#include "m64p_types.h"
 
 #define    S2DEX_BG_1CYC            0x01
 #define    S2DEX_BG_COPY            0x02

src/ucodes/UCode9.cpp

@@ -26,6 +26,7 @@
 #include "UCode0.h"
 #include "UCode9.h"
 #include "UCodeDefs.h"
+#include "m64p_types.h"
 
 #define F3DPD_VTXCOLORBASE        0x07
                              

src/ucodes/UCodeSelector.cpp

@@ -28,6 +28,7 @@
 #include "Memory.h"
 #include "UCodeIdentificationData.h"
 #include "UCodeSelector.h"
+#include "m64p_types.h"
 
 #ifndef WIN32
 #define strnicmp strncasecmp