diff --git a/360/file_browser.c b/360/file_browser.c
index baae8e60ba..ab88f024b2 100644
--- a/360/file_browser.c
+++ b/360/file_browser.c
@@ -16,7 +16,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Xtl.h>
+#define NOD3D
+#define NONET
+#include <xtl.h>
 #include "file_browser.h"
 #include "../general.h"
 #include "../file.h"
diff --git a/360/fonts.cpp b/360/fonts.cpp
index 73fc070b26..95b86835d2 100644
--- a/360/fonts.cpp
+++ b/360/fonts.cpp
@@ -16,6 +16,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define NONET
 #include <xtl.h>
 #include <malloc.h>
 #include "xdk360_video.h"
diff --git a/360/xdk360_audio.cpp b/360/xdk360_audio.cpp
index 5bb939afae..aa0d34ad9f 100644
--- a/360/xdk360_audio.cpp
+++ b/360/xdk360_audio.cpp
@@ -17,6 +17,8 @@
 
 #include "../driver.h"
 #include <stdlib.h>
+#define NOD3D
+#define NONET
 #include <xtl.h>
 #include "xaudio-c/xaudio.h"
 #include "../general.h"
diff --git a/360/xdk360_input.c b/360/xdk360_input.c
index 3eb02ba549..a90b1e9910 100644
--- a/360/xdk360_input.c
+++ b/360/xdk360_input.c
@@ -18,13 +18,15 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#define NOD3D
+#define NONET
 #include <xtl.h>
 #include "../driver.h"
 #include "../general.h"
 #include "../libsnes.hpp"
 #include "../input/input_luts.h"
 #include "xdk360_input.h"
-#include "xdk360_video.h"
+#include "xdk360_video_general.h"
 #include "shared.h"
 
 static uint64_t state[4];
diff --git a/360/xdk360_video.cpp b/360/xdk360_video.cpp
index 84dd2e9f2a..0cffb0f706 100644
--- a/360/xdk360_video.cpp
+++ b/360/xdk360_video.cpp
@@ -16,6 +16,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define NONET
 #include <xtl.h>
 
 #include "../driver.h"
diff --git a/360/xdk360_video.h b/360/xdk360_video.h
index 63a54fc60f..9f959ddf48 100644
--- a/360/xdk360_video.h
+++ b/360/xdk360_video.h
@@ -21,6 +21,7 @@
 
 #include <stdint.h>
 #include "fonts.h"
+#include "xdk360_video_general.h"
 
 typedef struct {
 	float x;
@@ -73,19 +74,12 @@ enum
 	ASPECT_RATIO_CUSTOM
 };
 
-#define LAST_ASPECT_RATIO ASPECT_RATIO_CUSTOM
-
-#define IS_TIMER_NOT_EXPIRED() (g_frame_count < g_console.timer_expiration_frame_count)
-#define IS_TIMER_EXPIRED() 	(!(IS_TIMER_NOT_EXPIRED()))
-#define SET_TIMER_EXPIRATION(value) g_console.timer_expiration_frame_count = g_frame_count + value;
-
 void xdk360_video_init(void);
 void xdk360_video_deinit(void);
 void xdk360_video_set_vsync(bool vsync);
 void xdk360_set_aspect_ratio(uint32_t aspectratio_index);
 void xdk360_set_orientation(uint32_t orientation);
 
-extern unsigned g_frame_count;
 extern void *g_d3d;
 
 #endif
diff --git a/360/xdk360_video_resources.cpp b/360/xdk360_video_resources.cpp
index e518caab08..d9909dbf4b 100644
--- a/360/xdk360_video_resources.cpp
+++ b/360/xdk360_video_resources.cpp
@@ -16,6 +16,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define NONET
 #include <xtl.h>
 #include <xgraphics.h>
 #include "xdk360_video.h"
diff --git a/conf/config_file.c b/conf/config_file.c
index b2bed953bb..aa31f4740c 100644
--- a/conf/config_file.c
+++ b/conf/config_file.c
@@ -32,6 +32,8 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #elif defined(_XBOX)
+#define NOD3D
+#define NONET
 #include <xtl.h>
 #endif
 
diff --git a/file.c b/file.c
index 12ce830781..7810fef541 100644
--- a/file.c
+++ b/file.c
@@ -44,6 +44,8 @@
 #define setmode _setmode
 #endif
 #elif defined(_XBOX)
+#define NOD3D
+#define NONET
 #include <xtl.h>
 #define setmode _setmode
 #define INVALID_FILE_ATTRIBUTES -1
diff --git a/general.h b/general.h
index 16c617b437..336f0299e6 100644
--- a/general.h
+++ b/general.h
@@ -63,6 +63,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #elif defined(_XBOX)
+#define NOD3D
 #include <xtl.h>
 #endif
 
diff --git a/input/input_luts.c b/input/input_luts.c
index 44954692a2..d409b7b0fc 100644
--- a/input/input_luts.c
+++ b/input/input_luts.c
@@ -17,6 +17,8 @@
  */
 
 #ifdef _XBOX
+#define NOD3D
+#define NONET
 #include <xtl.h>
 #endif