diff --git a/Source/Project64-video/Renderer/types.h b/Source/Project64-video/Renderer/types.h
new file mode 100644
index 000000000..8d739c151
--- /dev/null
+++ b/Source/Project64-video/Renderer/types.h
@@ -0,0 +1,17 @@
+/***************************************************************************
+*                                                                          *
+* Project64-video - A Nintendo 64 gfx plugin.                              *
+* http://www.pj64-emu.com/                                                 *
+* Copyright (C) 2017 Project64. All rights reserved.                       *
+* Copyright (C) 2003-2009  Sergey 'Gonetz' Lipski                          *
+* Copyright (C) 2002 Dave2001                                              *
+*                                                                          *
+* License:                                                                 *
+* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html                       *
+* version 2 of the License, or (at your option) any later version.         *
+*                                                                          *
+****************************************************************************/
+
+#pragma once
+#include <Common/stdtypes.h>
+
diff --git a/Source/Project64-video/rdp.h b/Source/Project64-video/rdp.h
index f969514bd..619938067 100644
--- a/Source/Project64-video/rdp.h
+++ b/Source/Project64-video/rdp.h
@@ -23,11 +23,13 @@ extern uint32_t frame_count; // frame counter
 //GlideHQ support
 #include "Ext_TxFilter.h"
 
-#define MAX_CACHE   1024*4
-#define MAX_TRI_CACHE 768 // this is actually # of vertices, not triangles
-#define MAX_VTX     256
-
-#define MAX_TMU     2
+enum
+{
+    MAX_CACHE = 1024 * 4,
+    MAX_TRI_CACHE = 768, // this is actually # of vertices, not triangles
+    MAX_VTX = 256,
+    MAX_TMU = 2,
+};
 
 #define MAXCMD 0x100000
 const unsigned int maxCMDMask = MAXCMD - 1;
@@ -131,7 +133,8 @@ typedef struct
 } VERTEX;
 
 // Clipping (scissors)
-typedef struct {
+typedef struct 
+{
     uint32_t ul_x;
     uint32_t ul_y;
     uint32_t lr_x;