Move libretro.h headers to libretro-common/include

audio/audio_resampler_driver.h

@@ -22,12 +22,13 @@
 extern "C" {
 #endif
 
-#include <stddef.h>
 #include <stdint.h>
+#include <stddef.h>
 #include <math.h>
-#include <boolean.h>
 
 #include <retro_miscellaneous.h>
+#include <boolean.h>
+#include <libretro.h>
 
 #define RESAMPLER_SIMD_SSE      (1 << 0)
 #define RESAMPLER_SIMD_SSE2     (1 << 1)
@@ -200,10 +201,6 @@ bool rarch_resampler_realloc(void **re, const rarch_resampler_t **backend,
    (backend)->process(handle, data); \
 } while(0)
 
-#ifndef RARCH_INTERNAL
-#include "libretro.h"
-extern retro_get_cpu_features_t perf_get_cpu_features_cb;
-#endif
 
 #ifdef __cplusplus
 }

camera/camera_driver.h

@@ -18,8 +18,9 @@
 #define __CAMERA_DRIVER__H
 
 #include <stdint.h>
+
 #include <boolean.h>
-#include "../libretro.h"
+#include <libretro.h>
 
 #ifdef __cplusplus
 extern "C" {

cheevos.c

@@ -20,10 +20,10 @@
 #include <streams/file_stream.h>
 #include <rhash.h>
 #include <rthreads/async_job.h>
+#include <libretro.h>
 
 #include "cheevos.h"
 #include "dynamic.h"
-#include "libretro.h"
 #include "network/net_http_special.h"
 #include "configuration.h"
 #include "performance_counters.h"

core.h

@@ -23,9 +23,9 @@ extern "C" {
 #endif
 
 #include <boolean.h>
+#include <libretro.h>
 
 #include "core_type.h"
-#include "libretro.h"
 
 enum
 {

core_impl.c

@@ -24,9 +24,9 @@
 #include <retro_inline.h>
 #include <boolean.h>
 #include <lists/string_list.h>
+#include <libretro.h>
 
 #include "dynamic.h"
-#include "libretro.h"
 #include "core.h"
 #include "general.h"
 #include "msg_hash.h"

cores/dynamic_dummy.c

@@ -19,8 +19,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <libretro.h>
+
 #include "internal_cores.h"
-#include "../libretro.h"
 
 static uint16_t *frame_buf;
 

cores/internal_cores.h

@@ -19,7 +19,7 @@
 #define INTERNAL_CORES_H__
 
 #include <boolean.h>
-#include "../libretro.h"
+#include <libretro.h>
 
 void libretro_dummy_retro_init(void);
 

cores/libretro-ffmpeg/ffmpeg_core.c

@@ -42,7 +42,7 @@ extern "C" {
 #include <rthreads/rthreads.h>
 #include <queues/fifo_queue.h>
 
-#include "libretro.h"
+#include <libretro.h>
 #ifdef RARCH_INTERNAL
 #include "internal_cores.h"
 #define CORE_PREFIX(s) libretro_ffmpeg_##s

cores/libretro-ffmpeg/libretro.h

@@ -1 +0,0 @@
-#include "../../libretro.h"

cores/libretro-imageviewer/image_core.c

@@ -22,12 +22,12 @@
 
 #include "../../deps/stb/stb_image.h"
 
+#include <libretro.h>
+
 #ifdef RARCH_INTERNAL
 #include "internal_cores.h"
-#include "../../libretro.h"
 #define IMAGE_CORE_PREFIX(s) libretro_imageviewer_##s
 #else
-#include "libretro.h"
 #define IMAGE_CORE_PREFIX(s) s
 #endif
 

cores/libretro-test-gl-ff/libretro_gl_ff_test.c

@@ -6,7 +6,7 @@
 
 #include <glsym/glsym.h>
 
-#include "../../libretro.h"
+#include <libretro.h>
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 static struct retro_hw_render_callback hw_render;

cores/libretro-test-gl/libretro_gl_test.c

@@ -6,7 +6,7 @@
 
 #include <glsym/glsym.h>
 
-#include "../../libretro.h"
+#include <libretro.h>
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 static struct retro_hw_render_callback hw_render;

cores/libretro-test/libretro-test.c

@@ -7,7 +7,7 @@
 
 #include <retro_miscellaneous.h>
 
-#include "../../libretro.h"
+#include <libretro.h>
 
 static uint32_t *frame_buf;
 static struct retro_log_callback logging;

cores/retropad/retropad.c

@@ -40,7 +40,7 @@
 
 #include <retro_miscellaneous.h>
 
-#include "../../libretro.h"
+#include <libretro.h>
 
 #ifndef SOCKET_ERROR
 #define SOCKET_ERROR -1

dynamic.h

@@ -18,9 +18,9 @@
 #define __DYNAMIC_H
 
 #include <boolean.h>
+#include <libretro.h>
 
 #include "core_type.h"
-#include "libretro.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

gfx/common/vulkan_common.h

@@ -38,13 +38,14 @@
 #include <rthreads/rthreads.h>
 #include <formats/image.h>
 
+#include <libretro.h>
+#include <libretro_vulkan.h>
+
 #include "../../driver.h"
-#include "../../libretro.h"
 #include "../../general.h"
 #include "../../retroarch.h"
 #include "../font_driver.h"
 #include "../video_context_driver.h"
-#include "../../libretro_vulkan.h"
 #include "../drivers_shader/shader_vulkan.h"
 
 typedef struct vulkan_filter_chain vulkan_filter_chain_t;

gfx/d3d/render_chain_driver.h

@@ -17,10 +17,11 @@
 #ifndef __D3D_RENDER_CHAIN_H
 #define __D3D_RENDER_CHAIN_H
 
+#include <libretro.h>
+
 #include "../video_driver.h"
 #include "../video_shader_parse.h"
 #include "../video_state_tracker.h"
-#include "../../libretro.h"
 #include "../../defines/d3d_defines.h"
 
 #ifdef __cplusplus

gfx/drivers/gl.c

@@ -31,12 +31,12 @@
 #include <retro_inline.h>
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
+#include <libretro.h>
 
 #include "../../driver.h"
 #include "../../record/record_driver.h"
 #include "../../performance_counters.h"
 
-#include "../../libretro.h"
 #include "../../general.h"
 #include "../../retroarch.h"
 #include "../../verbosity.h"

gfx/drivers/vg.c

@@ -24,9 +24,9 @@
 #include <retro_inline.h>
 #include <retro_assert.h>
 #include <gfx/math/matrix_3x3.h>
+#include <libretro.h>
 
 #include "../video_context_driver.h"
-#include "../../libretro.h"
 #include "../../general.h"
 #include "../../retroarch.h"
 #include "../../driver.h"

gfx/drivers/vulkan.c

@@ -13,6 +13,20 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
+#include <stdint.h>
+#include <math.h>
+#include <string.h>
+
+
+#include <compat/strl.h>
+#include <gfx/scaler/scaler.h>
+#include <formats/image.h>
+#include <retro_inline.h>
+#include <retro_miscellaneous.h>
+#include <retro_assert.h>
+#include <libretro.h>
+
 #include "../common/vulkan_common.h"
 #include "vulkan_shaders/alpha_blend.vert.inc"
 #include "vulkan_shaders/alpha_blend.frag.inc"
@@ -22,23 +36,10 @@
 #include "vulkan_shaders/ribbon_simple.vert.inc"
 #include "vulkan_shaders/ribbon_simple.frag.inc"
 
-#include <stdio.h>
-#include <stdint.h>
-#include <math.h>
-#include <string.h>
-
-#include <compat/strl.h>
-#include <gfx/scaler/scaler.h>
-#include <formats/image.h>
-#include <retro_inline.h>
-#include <retro_miscellaneous.h>
-#include <retro_assert.h>
-
 #include "../../driver.h"
 #include "../../record/record_driver.h"
 #include "../../performance_counters.h"
 
-#include "../../libretro.h"
 #include "../../general.h"
 #include "../../retroarch.h"
 

gfx/video_driver.h

@@ -22,12 +22,12 @@
 #include <sys/types.h>
 
 #include <boolean.h>
+#include <libretro.h>
 
 #include "font_driver.h"
 #include "video_filter.h"
 #include "video_shader_parse.h"
 
-#include "../libretro.h"
 #include "../input/input_driver.h"
 
 

gfx/video_filter.h

@@ -17,9 +17,10 @@
 #ifndef RARCH_FILTER_H__
 #define RARCH_FILTER_H__
 
-#include "../libretro.h"
 #include <stddef.h>
 
+#include <libretro.h>
+
 #define RARCH_SOFTFILTER_THREADS_AUTO 0
 typedef struct rarch_softfilter rarch_softfilter_t;
 

gfx/video_state_python.c

@@ -14,18 +14,20 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Python.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 
+#include <Python.h>
+
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <streams/file_stream.h>
 
+#include <libretro.h>
+
 #include "video_state_python.h"
 #include "../dynamic.h"
-#include "../libretro.h"
 #include "../core.h"
 #include "../general.h"
 #include "../verbosity.h"

input/common/input_x11_common.c

@@ -14,8 +14,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <libretro.h>
+
 #include "input_x11_common.h"
-#include "../../libretro.h"
 
 static bool x11_mouse_wu;
 static bool x11_mouse_wd;

input/connect/joypad_connection.h

@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include "../../libretro.h"
+#include <libretro.h>
 
 typedef void (*send_control_t)(void *data, uint8_t *buf, size_t size);
 

input/drivers/ctr_input.c

@@ -15,10 +15,11 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+
 #include <boolean.h>
+#include <libretro.h>
 
 #include "../../driver.h"
-#include "../../libretro.h"
 #include "../../general.h"
 #include "../input_config.h"
 #include "../input_joypad_driver.h"

input/drivers/gx_input.c

@@ -23,8 +23,9 @@
 #include <boolean.h>
 #include <retro_miscellaneous.h>
 
+#include <libretro.h>
+
 #include "../../driver.h"
-#include "../../libretro.h"
 
 #ifndef MAX_PADS
 #define MAX_PADS 4

input/drivers/ps3_input.c

@@ -17,14 +17,14 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <boolean.h>
-
 #include <sdk_version.h>
 
+#include <boolean.h>
+#include <libretro.h>
+
 #include "../../defines/ps3_defines.h"
 
 #include "../../driver.h"
-#include "../../libretro.h"
 #include "../../general.h"
 
 #ifdef HAVE_MOUSE

input/drivers/psp_input.c

@@ -17,8 +17,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <boolean.h>
-
 #if defined(SN_TARGET_PSP2)
 #include <sceerror.h>
 #include <kernel.h>
@@ -29,10 +27,12 @@
 #include <pspctrl.h>
 #endif
 
+#include <boolean.h>
+#include <libretro.h>
+
 #include "../../defines/psp_defines.h"
 
 #include "../../driver.h"
-#include "../../libretro.h"
 #include "../../general.h"
 #include "../input_config.h"
 #ifdef HAVE_KERNEL_PRX

input/drivers/sdl_input.c

@@ -19,6 +19,7 @@
 
 #include <boolean.h>
 #include <string/stdstring.h>
+#include <libretro.h>
 
 #include "../../driver.h"
 
@@ -26,7 +27,6 @@
 #include "../../gfx/video_context_driver.h"
 #include "../../general.h"
 #include "../../verbosity.h"
-#include "../../libretro.h"
 #include "../input_autodetect.h"
 #include "../input_config.h"
 #include "../input_joypad_driver.h"

input/drivers/xdk_xinput_input.c

@@ -17,15 +17,15 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <boolean.h>
-
 #ifdef _XBOX
 #include <xtl.h>
 #endif
 
+#include <boolean.h>
+#include <libretro.h>
+
 #include "../../driver.h"
 #include "../../general.h"
-#include "../../libretro.h"
 
 #define MAX_PADS 4
 

input/drivers/xenon360_input.c

@@ -18,12 +18,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../../driver.h"
-#include "../../libretro.h"
-
 #include <input/input.h>
 #include <usb/usbmain.h>
 
+#include <libretro.h>
+
+#include "../../driver.h"
+
 #define MAX_PADS 4
 
 static uint64_t state[MAX_PADS];

input/input_hid_driver.h

@@ -24,7 +24,7 @@ extern "C" {
 #include <stdint.h>
 #include <boolean.h>
 
-#include "../libretro.h"
+#include <libretro.h>
 
 typedef struct hid_driver hid_driver_t;
 

input/input_joypad_driver.h

@@ -23,8 +23,7 @@ extern "C" {
 
 #include <stdint.h>
 #include <boolean.h>
-
+#include <libretro.h>
-#include "../libretro.h"
 
 typedef struct rarch_joypad_driver input_device_driver_t;
 

input/input_keyboard.h

@@ -24,8 +24,7 @@ extern "C" {
 #include <stdint.h>
 
 #include <boolean.h>
-
+#include <libretro.h>
-#include "../libretro.h"
 
 enum rarch_input_keyboard_ctl_state
 {

input/input_keymaps.h

@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "../libretro.h"
+#include <libretro.h>
 
 #ifdef __cplusplus
 extern "C" {

libretro-common/include/libretro_vulkan.h

@@ -23,7 +23,7 @@
 #ifndef LIBRETRO_VULKAN_H__
 #define LIBRETRO_VULKAN_H__
 
-#include "libretro.h"
+#include <libretro.h>
 #include <vulkan/vulkan.h>
 
 #define RETRO_HW_RENDER_INTERFACE_VULKAN_VERSION 2

managers/core_option_manager.c

@@ -24,7 +24,7 @@
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
 
-#include "../libretro.h"
+#include <libretro.h>
 
 #include "core_option_manager.h"
 

network/net_http_special.h

@@ -17,7 +17,7 @@
 #ifndef __NET_HTTP_SPECIAL_H
 #define __NET_HTTP_SPECIAL_H
 
-#include "../libretro.h"
+#include <libretro.h>
 
 enum
 {

network/netplay.h

@@ -22,8 +22,8 @@
 #include <stddef.h>
 
 #include <boolean.h>
+#include <libretro.h>
 
-#include "../libretro.h"
 #include "../core.h"
 
 typedef struct netplay netplay_t;

performance.c

@@ -15,7 +15,7 @@
  */
 
 #include <stdio.h>
-#include "libretro.h"
+
 
 #if defined(_WIN32)
 #include <direct.h>
@@ -24,6 +24,7 @@
 #endif
 
 #include <compat/strl.h>
+#include <libretro.h>
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include <windows.h>

performance.h

@@ -19,12 +19,7 @@
 
 #include <stdint.h>
 
-#ifdef RARCH_INTERNAL
+#include <libretro.h>
-#include "libretro.h"
-#else
-typedef uint64_t retro_perf_tick_t;
-typedef uint64_t retro_time_t;
-#endif
 
 #ifdef __cplusplus
 extern "C" {

performance_counters.h

@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "libretro.h"
+#include <libretro.h>
 
 #ifdef __cplusplus
 extern "C" {

system.h

@@ -17,9 +17,9 @@
 #define __RARCH_SYSTEM_H
 
 #include <retro_miscellaneous.h>
+#include <libretro.h>
 
 #include "driver.h"
-#include "libretro.h"
 
 #ifndef MAX_USERS
 #define MAX_USERS 16