I prefer local include to differentiate

src/block-qcow.c

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "qemu-common.h"
+#include "qemu-git/qemu-common.h"
-#include "block.h"
+#include "include/block.h"
-#include "block_int.h"
+#include "include/block_int.h"
 #include <zlib.h>
 #if 0
 #include "aes.h"

src/block-raw.c

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "qemu-common.h"
+#include "qemu-git/qemu-common.h"
-#include "block.h"
+#include "include/block.h"
-#include "block_int.h"
+#include "include/block_int.h"
 #include <assert.h>
 #ifndef _WIN32
 

src/block.c

@@ -8,9 +8,9 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "qemu-common.h"
+#include "qemu-git/qemu-common.h"
-#include <block.h>
+#include "include/block.h"
-#include "block_int.h"
+#include "include/block_int.h"
 
 #define SECTOR_BITS	9
 #define SECTOR_SIZE	(1 << SECTOR_BITS)

src/flash.c

@@ -9,14 +9,15 @@
 #include <sys/mman.h>
 #include <errno.h>
 
+#include <memory.h>
+
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <cairo.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <x49gp_ui.h>
+#include "include/x49gp_ui.h"
-#include <memory.h>
+#include "include/byteorder.h"
-#include <byteorder.h>
 
 #define FLASH_STATE_NORMAL		0
 

src/gdbstub.c

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "qemu-common.h"
+#include "qemu-git/qemu-common.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -29,7 +29,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
 #include "gdbstub.h"
 
 #define MAX_PACKET_LENGTH 4096

src/gdbstub.h

@@ -1,6 +1,8 @@
 #ifndef GDBSTUB_H
 #define GDBSTUB_H
 
+#include "qemu-git/qemu-common.h"
+
 #define DEFAULT_GDBSTUB_PORT 1234
 
 /* GDB breakpoint/watchpoint types */

src/main.c

@@ -15,13 +15,14 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 
-#include <x49gp.h>
-#include <x49gp_ui.h>
 #include <memory.h>
-#include <s3c2410.h>
+
-#include <s3c2410_power.h>
+#include "include/x49gp.h"
-#include <s3c2410_timer.h>
+#include "include/x49gp_ui.h"
-#include <x49gp_timer.h>
+#include "include/s3c2410.h"
+#include "include/s3c2410_power.h"
+#include "include/s3c2410_timer.h"
+#include "include/x49gp_timer.h"
 
 #include "gdbstub.h"
 

src/module.c

@@ -9,7 +9,7 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
 
 int
 x49gp_modules_init(x49gp_t *x49gp)

src/s3c2410.c

@@ -10,8 +10,8 @@
 #include <sys/times.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
 
 /*
  * Boot SRAM:			0x40000000

src/s3c2410_adc.c

@@ -9,8 +9,8 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
 
 
 typedef struct {

src/s3c2410_arm.c

@@ -8,12 +8,12 @@
 #include <string.h>
 #include <errno.h>
 
-#include <cpu.h>
+#include "qemu-git/target-arm/cpu.h"
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
 
-#include "cpu-all.h"
+#include "qemu-git/cpu-all.h"
 
 static int
 s3c2410_arm_load(x49gp_module_t *module, GKeyFile *key)

src/s3c2410_intc.c

@@ -7,11 +7,11 @@
 #include <string.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
-#include <s3c2410_intc.h>
+#include "include/s3c2410_intc.h"
-#include <s3c2410_power.h>
+#include "include/s3c2410_power.h"
-#include <byteorder.h>
+#include "include/byteorder.h"
 
 extern int do_trace;
 

src/s3c2410_io_port.c

@@ -7,10 +7,10 @@
 #include <string.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
-#include <s3c2410_intc.h>
+#include "include/s3c2410_intc.h"
-#include <byteorder.h>
+#include "include/byteorder.h"
 
 
 typedef struct {

src/s3c2410_lcd.c

@@ -11,9 +11,9 @@
 
 #include <gtk/gtk.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <x49gp_ui.h>
+#include "include/x49gp_ui.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
 
 
 typedef struct {

src/s3c2410_memc.c

@@ -9,8 +9,8 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
 
 
 typedef struct {

src/s3c2410_nand.c

@@ -9,8 +9,8 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
 
 
 typedef struct {

src/s3c2410_power.c

@@ -9,9 +9,9 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
-#include <s3c2410_power.h>
+#include "include/s3c2410_power.h"
 
 static const uint32_t EXTCLK = 12000000;
 

src/s3c2410_rtc.c

@@ -10,9 +10,9 @@
 #include <time.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
-#include <s3c2410_intc.h>
+#include "include/s3c2410_intc.h"
 
 
 typedef struct {

src/s3c2410_sdi.c

@@ -10,10 +10,10 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
 
-#include <block.h>
+#include "include/block.h"
 
 //#define DEBUG_S3C2410_SDI 1
 

src/s3c2410_spi.c

@@ -9,9 +9,9 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
-#include <s3c2410_intc.h>
+#include "include/s3c2410_intc.h"
 
 
 typedef struct {

src/s3c2410_sram.c

@@ -9,9 +9,9 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
-#include <byteorder.h>
+#include "include/byteorder.h"
 
 typedef struct {
 	void		*data;

src/s3c2410_timer.c

@@ -9,10 +9,10 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
-#include <s3c2410_timer.h>
+#include "include/s3c2410_timer.h"
-#include <s3c2410_intc.h>
+#include "include/s3c2410_intc.h"
 
 
 typedef struct {

src/s3c2410_uart.c

@@ -9,9 +9,9 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
-#include <s3c2410_intc.h>
+#include "include/s3c2410_intc.h"
 
 
 typedef struct {

src/s3c2410_usbdev.c

@@ -9,8 +9,8 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
 
 
 typedef struct {

src/s3c2410_watchdog.c

@@ -9,9 +9,9 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
-#include <s3c2410_intc.h>
+#include "include/s3c2410_intc.h"
 
 
 typedef struct {

src/sram.c

@@ -9,11 +9,12 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include <x49gp.h>
 #include <memory.h>
-#include <byteorder.h>
 
-#include <saturn.h>
+#include "include/x49gp.h"
+#include "include/byteorder.h"
+
+#include "include/saturn.h"
 
 typedef struct {
 	void		*data;

src/symbol.c

@@ -7,7 +7,7 @@
 #include <glib.h>
 #include <cairo.h>
 
-#include <symbol.h>
+#include "include/symbol.h"
 
 static const cairo_path_data_t symbol_square_path_data[] =
 {

src/timer.c

@@ -14,12 +14,12 @@
 #include <errno.h>
 #include <poll.h>
 
-#include <x49gp.h>
-#include <x49gp_timer.h>
-#include <s3c2410.h>
-
 #include <glib.h>
 
+#include "include/x49gp.h"
+#include "include/x49gp_timer.h"
+#include "include/s3c2410.h"
+
 #include "gdbstub.h"
 
 typedef struct {

src/tiny_font.c

@@ -2,96 +2,97 @@
  */
 
 #include <stdlib.h>
-#include <bitmap_font.h>
 
-#include <tiny_notdef.xbm>
+#include "include/bitmap_font.h"
 
-#include <tiny_quotedbl.xbm>
+#include "bitmaps/tiny_notdef.xbm"
-#include <tiny_numbersign.xbm>
-#include <tiny_ampersand.xbm>
-#include <tiny_parenleft.xbm>
-#include <tiny_parenright.xbm>
-#include <tiny_comma.xbm>
-#include <tiny_hyphen.xbm>
-#include <tiny_period.xbm>
-#include <tiny_slash.xbm>
-#include <tiny_colon.xbm>
-#include <tiny_less.xbm>
-#include <tiny_equal.xbm>
-#include <tiny_greater.xbm>
-#include <tiny_bracketleft.xbm>
-#include <tiny_bracketright.xbm>
-#include <tiny_underscore.xbm>
-#include <tiny_braceleft.xbm>
-#include <tiny_braceright.xbm>
 
-#include <tiny_guillemotleft.xbm>
+#include "bitmaps/tiny_quotedbl.xbm"
-#include <tiny_guillemotright.xbm>
+#include "bitmaps/tiny_numbersign.xbm"
-#include <tiny_arrowleft.xbm>
+#include "bitmaps/tiny_ampersand.xbm"
-#include <tiny_arrowright.xbm>
+#include "bitmaps/tiny_parenleft.xbm"
+#include "bitmaps/tiny_parenright.xbm"
+#include "bitmaps/tiny_comma.xbm"
+#include "bitmaps/tiny_hyphen.xbm"
+#include "bitmaps/tiny_period.xbm"
+#include "bitmaps/tiny_slash.xbm"
+#include "bitmaps/tiny_colon.xbm"
+#include "bitmaps/tiny_less.xbm"
+#include "bitmaps/tiny_equal.xbm"
+#include "bitmaps/tiny_greater.xbm"
+#include "bitmaps/tiny_bracketleft.xbm"
+#include "bitmaps/tiny_bracketright.xbm"
+#include "bitmaps/tiny_underscore.xbm"
+#include "bitmaps/tiny_braceleft.xbm"
+#include "bitmaps/tiny_braceright.xbm"
 
-#include <tiny_large_comma.xbm>
+#include "bitmaps/tiny_guillemotleft.xbm"
-#include <tiny_overscore.xbm>
+#include "bitmaps/tiny_guillemotright.xbm"
+#include "bitmaps/tiny_arrowleft.xbm"
+#include "bitmaps/tiny_arrowright.xbm"
 
-#include <tiny_xsuperior.xbm>
+#include "bitmaps/tiny_large_comma.xbm"
-#include <tiny_twosuperior.xbm>
+#include "bitmaps/tiny_overscore.xbm"
 
-#include <tiny_math_e.xbm>
+#include "bitmaps/tiny_xsuperior.xbm"
-#include <tiny_math_x.xbm>
+#include "bitmaps/tiny_twosuperior.xbm"
-#include <tiny_math_y.xbm>
-#include <tiny_math_pi.xbm>
-#include <tiny_math_summation.xbm>
-#include <tiny_math_radical.xbm>
-#include <tiny_math_partialdiff.xbm>
-#include <tiny_math_integral.xbm>
-#include <tiny_math_infinity.xbm>
 
-#include <tiny_math_numbersign.xbm>
+#include "bitmaps/tiny_math_e.xbm"
-#include <tiny_math_less.xbm>
+#include "bitmaps/tiny_math_x.xbm"
-#include <tiny_math_greater.xbm>
+#include "bitmaps/tiny_math_y.xbm"
-#include <tiny_math_lessequal.xbm>
+#include "bitmaps/tiny_math_pi.xbm"
-#include <tiny_math_greaterequal.xbm>
+#include "bitmaps/tiny_math_summation.xbm"
-#include <tiny_math_equal.xbm>
+#include "bitmaps/tiny_math_radical.xbm"
-#include <tiny_math_notequal.xbm>
+#include "bitmaps/tiny_math_partialdiff.xbm"
+#include "bitmaps/tiny_math_integral.xbm"
+#include "bitmaps/tiny_math_infinity.xbm"
 
-#include <tiny_math_arrowleft.xbm>
+#include "bitmaps/tiny_math_numbersign.xbm"
-#include <tiny_math_arrowright.xbm>
+#include "bitmaps/tiny_math_less.xbm"
-#include <tiny_math_downarrowleft.xbm>
+#include "bitmaps/tiny_math_greater.xbm"
-#include <tiny_math_downarrowright.xbm>
+#include "bitmaps/tiny_math_lessequal.xbm"
+#include "bitmaps/tiny_math_greaterequal.xbm"
+#include "bitmaps/tiny_math_equal.xbm"
+#include "bitmaps/tiny_math_notequal.xbm"
 
-#include <tiny_zero.xbm>
+#include "bitmaps/tiny_math_arrowleft.xbm"
-#include <tiny_one.xbm>
+#include "bitmaps/tiny_math_arrowright.xbm"
-#include <tiny_two.xbm>
+#include "bitmaps/tiny_math_downarrowleft.xbm"
-#include <tiny_three.xbm>
+#include "bitmaps/tiny_math_downarrowright.xbm"
 
-#include <tiny_A.xbm>
+#include "bitmaps/tiny_zero.xbm"
-#include <tiny_B.xbm>
+#include "bitmaps/tiny_one.xbm"
-#include <tiny_C.xbm>
+#include "bitmaps/tiny_two.xbm"
-#include <tiny_D.xbm>
+#include "bitmaps/tiny_three.xbm"
-#include <tiny_E.xbm>
-#include <tiny_F.xbm>
-#include <tiny_G.xbm>
-#include <tiny_H.xbm>
-#include <tiny_I.xbm>
-#include <tiny_J.xbm>
-#include <tiny_K.xbm>
-#include <tiny_L.xbm>
-#include <tiny_M.xbm>
-#include <tiny_N.xbm>
-#include <tiny_O.xbm>
-#include <tiny_P.xbm>
-#include <tiny_Q.xbm>
-#include <tiny_R.xbm>
-#include <tiny_S.xbm>
-#include <tiny_T.xbm>
-#include <tiny_U.xbm>
-#include <tiny_V.xbm>
-#include <tiny_W.xbm>
-#include <tiny_X.xbm>
-#include <tiny_Y.xbm>
-#include <tiny_Z.xbm>
 
-#include <tiny__i.xbm>
+#include "bitmaps/tiny_A.xbm"
+#include "bitmaps/tiny_B.xbm"
+#include "bitmaps/tiny_C.xbm"
+#include "bitmaps/tiny_D.xbm"
+#include "bitmaps/tiny_E.xbm"
+#include "bitmaps/tiny_F.xbm"
+#include "bitmaps/tiny_G.xbm"
+#include "bitmaps/tiny_H.xbm"
+#include "bitmaps/tiny_I.xbm"
+#include "bitmaps/tiny_J.xbm"
+#include "bitmaps/tiny_K.xbm"
+#include "bitmaps/tiny_L.xbm"
+#include "bitmaps/tiny_M.xbm"
+#include "bitmaps/tiny_N.xbm"
+#include "bitmaps/tiny_O.xbm"
+#include "bitmaps/tiny_P.xbm"
+#include "bitmaps/tiny_Q.xbm"
+#include "bitmaps/tiny_R.xbm"
+#include "bitmaps/tiny_S.xbm"
+#include "bitmaps/tiny_T.xbm"
+#include "bitmaps/tiny_U.xbm"
+#include "bitmaps/tiny_V.xbm"
+#include "bitmaps/tiny_W.xbm"
+#include "bitmaps/tiny_X.xbm"
+#include "bitmaps/tiny_Y.xbm"
+#include "bitmaps/tiny_Z.xbm"
+
+#include "bitmaps/tiny__i.xbm"
 
 const bitmap_font_t tiny_font =
 {

src/ui.c

@@ -16,19 +16,18 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <cairo.h>
+#include <gdk/gdkkeysyms.h>
 
-#include <x49gp.h>
+#include "include/x49gp.h"
-#include <x49gp_ui.h>
+#include "include/x49gp_ui.h"
-#include <s3c2410.h>
+#include "include/s3c2410.h"
-#include <bitmaps.h>
+#include "include/bitmaps.h"
-#include <bitmap_font.h>
+#include "include/bitmap_font.h"
-#include <symbol.h>
+#include "include/symbol.h"
-#include <glyphname.h>
+#include "include/glyphname.h"
 
 #include "gdbstub.h"
 
-#include <gdk/gdkkeysyms.h>
-
 #if defined(__linux__)
 #define X49GP_UI_NORMAL_FONT	"urw gothic l"
 #else