diff --git a/Facepunch.Steamworks/Callbacks/Callback.VTable.cs b/Facepunch.Steamworks/Callbacks/Callback.VTable.cs
index 834fdff..c3b5602 100644
--- a/Facepunch.Steamworks/Callbacks/Callback.VTable.cs
+++ b/Facepunch.Steamworks/Callbacks/Callback.VTable.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
+using Steamworks.Data;
 
 namespace Steamworks
 {
diff --git a/Facepunch.Steamworks/Callbacks/Callback.VTableThis.cs b/Facepunch.Steamworks/Callbacks/Callback.VTableThis.cs
index 1dab22c..87aadc1 100644
--- a/Facepunch.Steamworks/Callbacks/Callback.VTableThis.cs
+++ b/Facepunch.Steamworks/Callbacks/Callback.VTableThis.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
+using Steamworks.Data;
 
 namespace Steamworks
 {
diff --git a/Facepunch.Steamworks/Callbacks/Callback.VTableWin.cs b/Facepunch.Steamworks/Callbacks/Callback.VTableWin.cs
index 402c1e3..eef0365 100644
--- a/Facepunch.Steamworks/Callbacks/Callback.VTableWin.cs
+++ b/Facepunch.Steamworks/Callbacks/Callback.VTableWin.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
+using Steamworks.Data;
 
 namespace Steamworks
 {
diff --git a/Facepunch.Steamworks/Callbacks/Callback.VTableWinThis.cs b/Facepunch.Steamworks/Callbacks/Callback.VTableWinThis.cs
index 0f3ba6a..ec839cb 100644
--- a/Facepunch.Steamworks/Callbacks/Callback.VTableWinThis.cs
+++ b/Facepunch.Steamworks/Callbacks/Callback.VTableWinThis.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
+using Steamworks.Data;
 
 namespace Steamworks
 {
diff --git a/Facepunch.Steamworks/Callbacks/Events.cs b/Facepunch.Steamworks/Callbacks/Events.cs
index 2a3888d..590fd70 100644
--- a/Facepunch.Steamworks/Callbacks/Events.cs
+++ b/Facepunch.Steamworks/Callbacks/Events.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using Steamworks.Data;
 
 namespace Steamworks
 {
diff --git a/Facepunch.Steamworks/Generated/SteamConstants.cs b/Facepunch.Steamworks/Generated/SteamConstants.cs
index 05143ea..7042556 100644
--- a/Facepunch.Steamworks/Generated/SteamConstants.cs
+++ b/Facepunch.Steamworks/Generated/SteamConstants.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 using System.Linq;
 using Steamworks.Data;
 
-namespace Steamworks
+namespace Steamworks.Data
 {
 	internal static class CallbackIdentifiers
 	{
diff --git a/Facepunch.Steamworks/Generated/SteamTypes.cs b/Facepunch.Steamworks/Generated/SteamTypes.cs
index 52799dd..9c6ff3b 100644
--- a/Facepunch.Steamworks/Generated/SteamTypes.cs
+++ b/Facepunch.Steamworks/Generated/SteamTypes.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 using System.Linq;
 using Steamworks.Data;
 
-namespace Steamworks
+namespace Steamworks.Data
 {
 	internal struct GID_t
 	{
diff --git a/Generator/CodeWriter/CodeWriter.cs b/Generator/CodeWriter/CodeWriter.cs
index f93133d..1571bb6 100644
--- a/Generator/CodeWriter/CodeWriter.cs
+++ b/Generator/CodeWriter/CodeWriter.cs
@@ -33,7 +33,7 @@ namespace Generator
 
             {
                 sb = new StringBuilder();
-                Header();
+                Header( "Steamworks.Data" );
                 Types();
                 Footer();
                 System.IO.File.WriteAllText( $"{folder}SteamTypes.cs", sb.ToString() );
@@ -49,7 +49,7 @@ namespace Generator
 
             {
                 sb = new StringBuilder();
-                Header();
+                Header( "Steamworks.Data" );
                 Constants();
                 Footer();
                 System.IO.File.WriteAllText( $"{folder}SteamConstants.cs", sb.ToString() );