diff --git a/spasm/solution/genie.lua b/spasm/solution/genie.lua
index 5ba467c6..ed9b980b 100644
--- a/spasm/solution/genie.lua
+++ b/spasm/solution/genie.lua
@@ -38,7 +38,7 @@ end
         uuid(os.uuid('sprt'))
         files '../src/*.cpp'
         removefiles '../src/main.cpp'
-        files '../src/*.h'
+        files '../src/*.hpp'
 
     project 'spasm_lib'
         kind 'StaticLib'
@@ -51,7 +51,7 @@ end
             '../src/asm/lexdump.cpp',
             '../src/asm/lexdump3.cpp',
         }
-        files '../src/asm/*.h'
+        files '../src/asm/*.hpp'
 
     project 'spasm'
         kind 'ConsoleApp'
@@ -64,7 +64,7 @@ end
             '../src/asm/lexdump.cpp',
             '../src/asm/lexdump3.cpp',
         }
-        files '../src/asm/*.h'
+        files '../src/asm/*.hpp'
 
     project 'sprun'
         kind 'ConsoleApp'
diff --git a/spasm/src/asm/bytecode.hpp b/spasm/src/asm/bytecode.hpp
index bc7f93b7..b8afb622 100644
--- a/spasm/src/asm/bytecode.hpp
+++ b/spasm/src/asm/bytecode.hpp
@@ -13,7 +13,7 @@ namespace ASM
 class Bytecode_Stream
 {
    public:
-    typedef int8_t byte;
+    typedef uint8_t byte;
     typedef byte Opcode_t;
 
     virtual ~Bytecode_Stream();
diff --git a/spasm/src/types.hpp b/spasm/src/types.hpp
index a5d45d8d..ab50254f 100644
--- a/spasm/src/types.hpp
+++ b/spasm/src/types.hpp
@@ -9,7 +9,7 @@
 
 namespace SpasmImpl
 {
-typedef int8_t byte;
+typedef uint8_t byte;
 typedef size_t PC_t;
 typedef Spasm::Value data_t;