diff --git a/.gitattributes b/.gitattributes
index db416de622f..a313f09c9e0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2700,6 +2700,8 @@ src/mame/includes/norautp.h svneol=native#text/plain
 src/mame/includes/nova2001.h svneol=native#text/plain
 src/mame/includes/nycaptor.h svneol=native#text/plain
 src/mame/includes/offtwall.h svneol=native#text/plain
+src/mame/includes/ohmygod.h svneol=native#text/plain
+src/mame/includes/ojankohs.h svneol=native#text/plain
 src/mame/includes/oneshot.h svneol=native#text/plain
 src/mame/includes/opwolf.h svneol=native#text/plain
 src/mame/includes/orbit.h svneol=native#text/plain
diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h
new file mode 100644
index 00000000000..57e22910b7b
--- /dev/null
+++ b/src/mame/includes/ohmygod.h
@@ -0,0 +1,39 @@
+/*************************************************************************
+
+    Oh My God!
+
+*************************************************************************/
+
+class ohmygod_state
+{
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ohmygod_state(machine)); }
+
+	ohmygod_state(running_machine &machine) { }
+	
+
+	/* memory pointers */
+	UINT16 *    videoram;
+	UINT16 *    spriteram;
+	size_t      spriteram_size;
+
+	/* video-related */
+	tilemap_t    *bg_tilemap;
+	int spritebank;
+	UINT16 scrollx, scrolly;
+
+	/* misc */
+	int adpcm_bank_shift;
+	int sndbank;
+};
+
+
+/*----------- defined in video/ohmygod.c -----------*/
+
+WRITE16_HANDLER( ohmygod_videoram_w );
+WRITE16_HANDLER( ohmygod_spritebank_w );
+WRITE16_HANDLER( ohmygod_scrollx_w );
+WRITE16_HANDLER( ohmygod_scrolly_w );
+
+VIDEO_START( ohmygod );
+VIDEO_UPDATE( ohmygod );
diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h
new file mode 100644
index 00000000000..f9d08851ef4
--- /dev/null
+++ b/src/mame/includes/ojankohs.h
@@ -0,0 +1,60 @@
+/*************************************************************************
+
+    Ojanko High School & other Video System mahjong series
+
+*************************************************************************/
+
+class ojankohs_state
+{
+public:
+	static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ojankohs_state(machine)); }
+
+	ojankohs_state(running_machine &machine) { }
+
+	/* memory pointers */
+	UINT8 *   videoram;
+	UINT8 *   colorram;
+	UINT8 *   paletteram;
+
+	/* video-related */
+	tilemap_t  *tilemap;
+	bitmap_t   *tmpbitmap;
+	int       gfxreg;
+	int       flipscreen, flipscreen_old;
+	int       scrollx, scrolly;
+	int       screen_refresh;
+
+	/* misc */
+	int       portselect;
+	int       adpcm_reset;
+	int       adpcm_data;
+	int       vclk_left;
+
+	/* devices */
+	running_device *maincpu;
+	running_device *msm;
+};
+
+
+/*----------- defined in video/ojankohs.c -----------*/
+
+WRITE8_HANDLER( ojankohs_palette_w );
+WRITE8_HANDLER( ccasino_palette_w );
+WRITE8_HANDLER( ojankohs_videoram_w );
+WRITE8_HANDLER( ojankohs_colorram_w );
+WRITE8_HANDLER( ojankohs_gfxreg_w );
+WRITE8_HANDLER( ojankohs_flipscreen_w );
+WRITE8_HANDLER( ojankoc_palette_w );
+WRITE8_HANDLER( ojankoc_videoram_w );
+
+PALETTE_INIT( ojankoy );
+
+VIDEO_START( ojankohs );
+VIDEO_START( ojankoy );
+VIDEO_START( ojankoc );
+
+VIDEO_UPDATE( ojankohs );
+VIDEO_UPDATE( ojankoc );
+
+void ojankoc_flipscreen(const address_space *space, int data);
+