diff --git a/logger/generic_logger_override.h b/logger/generic_logger_override.h
new file mode 100644
index 0000000000..bafdeae24a
--- /dev/null
+++ b/logger/generic_logger_override.h
@@ -0,0 +1,86 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GENERIC_LOGGER_H
+#define __GENERIC_LOGGER_H
+
+#ifndef RARCH_LOG
+#undef RARCH_LOG_V
+#define RARCH_LOG(...) do { \
+      if (RARCH_LOG_VERBOSE) \
+      { \
+         fprintf(LOG_FILE, "%s: %s: ", PROGRAM_NAME, __FUNCTION__); \
+         fprintf(LOG_FILE, __VA_ARGS__); \
+         fflush(LOG_FILE); \
+      } \
+   } while (0)
+#define RARCH_LOG_V(tag, fmt, vp) do { \
+      if (RARCH_LOG_VERBOSE) \
+      { \
+         fprintf(LOG_FILE, "%s: %s: ", PROGRAM_NAME, __FUNCTION__); \
+         fprintf(LOG_FILE, tag);\
+         vfprintf(LOG_FILE, fmt, vp); \
+         fflush(LOG_FILE); \
+      } \
+   } while (0)
+#endif
+
+#ifndef RARCH_LOG_OUTPUT
+#undef RARCH_LOG_OUTPUT_V
+#define RARCH_LOG_OUTPUT(...) do { \
+      fprintf(LOG_FILE, "%s: ", __FUNCTION__); \
+      fprintf(LOG_FILE, __VA_ARGS__); \
+      fflush(LOG_FILE); \
+   } while (0)
+#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \
+      fprintf(LOG_FILE, "%s: %s: ", PROGRAM_NAME, __FUNCTION__); \
+      fprintf(LOG_FILE, tag); \
+      vfprintf(LOG_FILE, fmt, vp); \
+      fflush(LOG_FILE); \
+   } while (0)
+#endif
+
+#ifndef RARCH_ERR
+#undef RARCH_ERR_V
+#define RARCH_ERR(...) do { \
+      fprintf(LOG_FILE, "%s [ERROR] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
+      fprintf(LOG_FILE, __VA_ARGS__); \
+      fflush(LOG_FILE); \
+   } while (0)
+#define RARCH_ERR_V(tag, fmt, vp) do { \
+      fprintf(LOG_FILE, "%s [ERROR] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
+      fprintf(LOG_FILE, tag); \
+      vfprintf(LOG_FILE, fmt, vp); \
+      fflush(LOG_FILE); \
+   } while (0)
+#endif
+
+#ifndef RARCH_WARN
+#undef RARCH_WARN_V
+#define RARCH_WARN(...) do { \
+      fprintf(LOG_FILE, "%s [WARN] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
+      fprintf(LOG_FILE, __VA_ARGS__); \
+      fflush(LOG_FILE); \
+   } while (0)
+#define RARCH_WARN_V(tag, fmt, vp) do { \
+      fprintf(LOG_FILE, "%s [WARN] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
+      fprintf(LOG_FILE, tag); \
+      vfprintf(LOG_FILE, fmt, vp); \
+      fflush(LOG_FILE); \
+   } while (0)
+#endif
+
+#endif
diff --git a/retroarch_logger.h b/retroarch_logger.h
index 505d7b4e7f..f16f45e0ee 100644
--- a/retroarch_logger.h
+++ b/retroarch_logger.h
@@ -49,73 +49,7 @@
 #elif defined(ANDROID) && defined(HAVE_LOGGER) && defined(RARCH_INTERNAL)
 #include "logger/android_logger_override.h"
 #else
-
-#ifndef RARCH_LOG
-#undef RARCH_LOG_V
-#define RARCH_LOG(...) do { \
-      if (RARCH_LOG_VERBOSE) \
-      { \
-         fprintf(LOG_FILE, "%s: %s: ", PROGRAM_NAME, __FUNCTION__); \
-         fprintf(LOG_FILE, __VA_ARGS__); \
-         fflush(LOG_FILE); \
-      } \
-   } while (0)
-#define RARCH_LOG_V(tag, fmt, vp) do { \
-      if (RARCH_LOG_VERBOSE) \
-      { \
-         fprintf(LOG_FILE, "%s: %s: ", PROGRAM_NAME, __FUNCTION__); \
-         fprintf(LOG_FILE, tag);\
-         vfprintf(LOG_FILE, fmt, vp); \
-         fflush(LOG_FILE); \
-      } \
-   } while (0)
-#endif
-
-#ifndef RARCH_LOG_OUTPUT
-#undef RARCH_LOG_OUTPUT_V
-#define RARCH_LOG_OUTPUT(...) do { \
-      fprintf(LOG_FILE, "%s: ", __FUNCTION__); \
-      fprintf(LOG_FILE, __VA_ARGS__); \
-      fflush(LOG_FILE); \
-   } while (0)
-#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \
-      fprintf(LOG_FILE, "%s: %s: ", PROGRAM_NAME, __FUNCTION__); \
-      fprintf(LOG_FILE, tag); \
-      vfprintf(LOG_FILE, fmt, vp); \
-      fflush(LOG_FILE); \
-   } while (0)
-#endif
-
-#ifndef RARCH_ERR
-#undef RARCH_ERR_V
-#define RARCH_ERR(...) do { \
-      fprintf(LOG_FILE, "%s [ERROR] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
-      fprintf(LOG_FILE, __VA_ARGS__); \
-      fflush(LOG_FILE); \
-   } while (0)
-#define RARCH_ERR_V(tag, fmt, vp) do { \
-      fprintf(LOG_FILE, "%s [ERROR] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
-      fprintf(LOG_FILE, tag); \
-      vfprintf(LOG_FILE, fmt, vp); \
-      fflush(LOG_FILE); \
-   } while (0)
-#endif
-
-#ifndef RARCH_WARN
-#undef RARCH_WARN_V
-#define RARCH_WARN(...) do { \
-      fprintf(LOG_FILE, "%s [WARN] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
-      fprintf(LOG_FILE, __VA_ARGS__); \
-      fflush(LOG_FILE); \
-   } while (0)
-#define RARCH_WARN_V(tag, fmt, vp) do { \
-      fprintf(LOG_FILE, "%s [WARN] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
-      fprintf(LOG_FILE, tag); \
-      vfprintf(LOG_FILE, fmt, vp); \
-      fflush(LOG_FILE); \
-   } while (0)
-#endif
-
+#include "logger/generic_logger_override.h"
 #endif
 
 #endif