1.1 --- a/src/eventq.c	Sun Jul 06 05:35:13 2008 +0000
     1.2 +++ b/src/eventq.c	Tue Jul 08 12:28:10 2008 +0000
     1.3 @@ -23,7 +23,7 @@
     1.4  #include "dreamcast.h"
     1.5  #include "eventq.h"
     1.6  #include "asic.h"
     1.7 -#include "sh4.h"
     1.8 +#include "sh4/sh4.h"
     1.9  
    1.10  #define LONG_SCAN_PERIOD 1000000000 /* 1 second */
    1.11  

     2.1 --- a/src/sh4/sh4dasm.c	Sun Jul 06 05:35:13 2008 +0000
     2.2 +++ b/src/sh4/sh4dasm.c	Tue Jul 08 12:28:10 2008 +0000
     2.3 @@ -16,8 +16,8 @@
     2.4   * GNU General Public License for more details.
     2.5   */
     2.6  
     2.7 -#include "sh4core.h"
     2.8 -#include "sh4dasm.h"
     2.9 +#include "sh4/sh4core.h"
    2.10 +#include "sh4/sh4dasm.h"
    2.11  #include "mem.h"
    2.12  
    2.13  #define UNIMP(ir) snprintf( buf, len, "???     " )

     3.1 --- a/src/sh4/sh4dasm.in	Sun Jul 06 05:35:13 2008 +0000
     3.2 +++ b/src/sh4/sh4dasm.in	Tue Jul 08 12:28:10 2008 +0000
     3.3 @@ -16,8 +16,8 @@
     3.4   * GNU General Public License for more details.
     3.5   */
     3.6  
     3.7 -#include "sh4core.h"
     3.8 -#include "sh4dasm.h"
     3.9 +#include "sh4/sh4core.h"
    3.10 +#include "sh4/sh4dasm.h"
    3.11  #include "mem.h"
    3.12  
    3.13  #define UNIMP(ir) snprintf( buf, len, "???     " )

     4.1 --- a/src/sh4/sh4stat.c	Sun Jul 06 05:35:13 2008 +0000
     4.2 +++ b/src/sh4/sh4stat.c	Tue Jul 08 12:28:10 2008 +0000
     4.3 @@ -17,8 +17,8 @@
     4.4   */
     4.5  
     4.6  #include "dream.h"
     4.7 -#include "sh4stat.h"
     4.8 -#include "sh4core.h"
     4.9 +#include "sh4/sh4stat.h"
    4.10 +#include "sh4/sh4core.h"
    4.11  
    4.12  static uint64_t sh4_stats[SH4_INSTRUCTION_COUNT+1];
    4.13  static uint64_t sh4_stats_total;

     5.1 --- a/src/sh4/sh4stat.in	Sun Jul 06 05:35:13 2008 +0000
     5.2 +++ b/src/sh4/sh4stat.in	Tue Jul 08 12:28:10 2008 +0000
     5.3 @@ -17,8 +17,8 @@
     5.4   */
     5.5  
     5.6  #include "dream.h"
     5.7 -#include "sh4stat.h"
     5.8 -#include "sh4core.h"
     5.9 +#include "sh4/sh4stat.h"
    5.10 +#include "sh4/sh4core.h"
    5.11  
    5.12  static uint64_t sh4_stats[SH4_INSTRUCTION_COUNT+1];
    5.13  static uint64_t sh4_stats_total;