@@ -105,7 +105,6 @@

     <ClInclude Include="vbam\apu\Multi_Buffer.h" />

     <ClInclude Include="vbam\common\Port.h" />

     <ClInclude Include="vbam\common\SoundDriver.h" />

-    <ClInclude Include="vbam\common\Types.h" />

     <ClInclude Include="vbam\gba\bios.h" />

     <ClInclude Include="vbam\gba\GBA.h" />

     <ClInclude Include="vbam\gba\GBAcpu.h" />

@@ -125,8 +125,5 @@

     <ClInclude Include="vbam\gba\Sound.h">

       <Filter>Header Files\vbam\gba</Filter>

     </ClInclude>

-    <ClInclude Include="vbam\common\Types.h">

-      <Filter>Header Files\vbam\common</Filter>

-    </ClInclude>

   </ItemGroup>

 </Project>

\ No newline at end of file

@@ -1,7 +1,7 @@

 #ifndef PORT_H

 #define PORT_H

-#include "Types.h"

+#include <cstdint>

 // swaps a 16-bit value

 static inline uint16_t swap16(uint16_t v)

@@ -18,7 +18,7 @@

 #ifndef __VBA_SOUND_DRIVER_H__

 #define __VBA_SOUND_DRIVER_H__

-#include "Types.h"

+#include <cstdint>

 /**

  * Sound driver abstract interface for the core to use to output sound.

deleted file mode 100644

@@ -1,33 +0,0 @@

-// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.

-// Copyright (C) 2008 VBA-M development team

-

-// This program 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 Foundation; either version 2, or(at your option)

-// any later version.

-//

-// This program 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 this program; if not, write to the Free Software Foundation,

-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-

-#ifndef __VBA_TYPES_H__

-#define __VBA_TYPES_H__

-

-#include <stdint.h>

-

-/*typedef uint8_t u8;

-typedef uint16_t u16;

-typedef uint32_t u32;

-typedef uint64_t u64;

-

-typedef int8_t s8;

-typedef int16_t s16;

-typedef int32_t s32;

-typedef int64_t s64;*/

-

-#endif // __VBA_TYPES_H__

@@ -1,8 +1,7 @@

 #ifndef GBA_H

 #define GBA_H

-//#include "../System.h"

-#include "../common/Types.h"

+#include <cstdint>

 /*#define SAVE_GAME_VERSION_1 1

 #define SAVE_GAME_VERSION_2 2

@@ -1,7 +1,7 @@

 #ifndef GLOBALS_H

 #define GLOBALS_H

-#include "../common/Types.h"

+#include <cstdint>

 #include "GBA.h"

 #define VERBOSE_SWI                  1

@@ -3,8 +3,7 @@

 // Sound emulation setup/options and GBA sound emulation

-//#include "../System.h"

-#include "../common/Types.h"

+#include <cstdint>

 extern bool soundDeclicking;