diff --git a/src/BuildSystem.bf b/src/BuildSystem.bf
index 60d9500..7da4edb 100644
--- a/src/BuildSystem.bf
+++ b/src/BuildSystem.bf
@@ -51,7 +51,7 @@ extension Clang
  * Object encapsulating information about overlaying virtual
  * file/directories over the real file system.
  */
-[CRepr] public struct CXVirtualFileOverlayImpl; public struct CXVirtualFileOverlay : this(CXVirtualFileOverlayImpl* ptr);
+[CRepr] public struct CXVirtualFileOverlayImpl; public struct CXVirtualFileOverlay : int {}
 
 extension Clang
 {
@@ -110,7 +110,7 @@ extension Clang
 /**
  * Object encapsulating information about a module.modulemap file.
  */
-[CRepr] public struct CXModuleMapDescriptorImpl; public struct CXModuleMapDescriptor : this(CXModuleMapDescriptorImpl* ptr);
+[CRepr] public struct CXModuleMapDescriptorImpl; public struct CXModuleMapDescriptor : int {}
 
 extension Clang
 {
diff --git a/src/CXCompilationDatabase.bf b/src/CXCompilationDatabase.bf
index c4ed1e2..152595d 100644
--- a/src/CXCompilationDatabase.bf
+++ b/src/CXCompilationDatabase.bf
@@ -46,7 +46,7 @@ static
  *
  * Must be freed by \c clang_CompilationDatabase_dispose
  */
-public struct CXCompilationDatabase : this(void* ptr);
+public struct CXCompilationDatabase : int {}
 
 /**
  * Contains the results of a search in the compilation database
@@ -57,12 +57,12 @@ public struct CXCompilationDatabase : this(void* ptr);
  * commands is wrapped in this opaque data structure. It must be freed by
  * \c clang_CompileCommands_dispose.
  */
-public struct CXCompileCommands : this(void* ptr);
+public struct CXCompileCommands : int {}
 
 /**
  * Represents the command line invocation to compile a specific file.
  */
-public struct CXCompileCommand : this(void* ptr);
+public struct CXCompileCommand : int {}
 
 /**
  * Error codes for Compilation Database
diff --git a/src/CXDiagnostic.bf b/src/CXDiagnostic.bf
index e54e7ec..a28b1ec 100644
--- a/src/CXDiagnostic.bf
+++ b/src/CXDiagnostic.bf
@@ -78,12 +78,12 @@ static
  * A single diagnostic, containing the diagnostic's severity,
  * location, text, source ranges, and fix-it hints.
  */
-public struct CXDiagnostic : this(void* ptr);
+public struct CXDiagnostic : int {}
 
 /**
  * A group of CXDiagnostics.
  */
-public struct CXDiagnosticSet : this(void* ptr);
+public struct CXDiagnosticSet : int {}
 
 extension Clang
 {
diff --git a/src/CXFile.bf b/src/CXFile.bf
index bfe0b84..8a91fba 100644
--- a/src/CXFile.bf
+++ b/src/CXFile.bf
@@ -43,7 +43,7 @@ static
 /**
  * A particular source file that is part of a translation unit.
  */
-public struct CXFile : this(void* ptr);
+public struct CXFile : int {}
 
 extension Clang
 {
diff --git a/src/Documentation.bf b/src/Documentation.bf
index f44a466..ae13c73 100644
--- a/src/Documentation.bf
+++ b/src/Documentation.bf
@@ -566,7 +566,7 @@ extension Clang
  * the API information for a given translation unit. This can be used for a
  * single symbol symbol graph for a given symbol.
  */
-[CRepr] public struct CXAPISetImpl; public struct CXAPISet : this(CXAPISetImpl* ptr);
+[CRepr] public struct CXAPISetImpl; public struct CXAPISet : int {}
 
 extension Clang
 {
diff --git a/src/Index.bf b/src/Index.bf
index 2668695..b640ade 100644
--- a/src/Index.bf
+++ b/src/Index.bf
@@ -91,18 +91,18 @@ public const let CINDEX_VERSION_STRING
  * An "index" that consists of a set of translation units that would
  * typically be linked together into an executable or library.
  */
-public struct CXIndex : this(void* ptr);
+public struct CXIndex : int {}
 
 /**
  * An opaque type representing target information for a given translation
  * unit.
  */
-[CRepr] public struct CXTargetInfoImpl; public struct CXTargetInfo : this(CXTargetInfoImpl* ptr);
+[CRepr] public struct CXTargetInfoImpl; public struct CXTargetInfo : int {}
 
 /**
  * A single translation unit, which resides in an index.
  */
-[CRepr] public struct CXTranslationUnitImpl; public struct CXTranslationUnit : this(CXTranslationUnitImpl* ptr);
+[CRepr] public struct CXTranslationUnitImpl; public struct CXTranslationUnit : int {}
 
 /**
  * Opaque pointer representing client data that will be passed through
@@ -2678,7 +2678,7 @@ extension Clang
 /**
  * A fast container representing a set of CXCursors.
  */
-[CRepr] public struct CXCursorSetImpl; public struct CXCursorSet : this(CXCursorSetImpl* ptr);
+[CRepr] public struct CXCursorSetImpl; public struct CXCursorSet : int {}
 
 extension Clang
 {
@@ -4086,7 +4086,7 @@ extension Clang
 
 
 
-[CRepr] public struct _CXChildVisitResult; public struct CXCursorVisitorBlock : this(_CXChildVisitResult* ptr);
+[CRepr] public struct _CXChildVisitResult; public struct CXCursorVisitorBlock : int {}
 
 
 extension Clang
@@ -4181,7 +4181,7 @@ extension Clang
  * Opaque pointer representing a policy that controls pretty printing
  * for \c clang_getCursorPrettyPrinted.
  */
-public struct CXPrintingPolicy : this(void* ptr);
+public struct CXPrintingPolicy : int {}
 
 /**
  * Properties for the printing policy.
@@ -4664,7 +4664,7 @@ extension Clang
  * @{
  */
 
-public struct CXModule : this(void* ptr);
+public struct CXModule : int {}
 
 extension Clang
 {
@@ -5204,7 +5204,7 @@ extension Clang
  * with actual code,of a specific kind. See \c CXCompletionChunkKind for a
  * description of the different kinds of chunks.
  */
-public struct CXCompletionString : this(void* ptr);
+public struct CXCompletionString : int {}
 
 /**
  * A single result of code completion.
@@ -6032,7 +6032,7 @@ extension Clang
 /**
  * Evaluation result of a cursor
  */
-public struct CXEvalResult : this(void* ptr);
+public struct CXEvalResult : int {}
 
 extension Clang
 {
@@ -6161,7 +6161,7 @@ extension Clang
 [Import(Clang.dll)] [LinkName("clang_findIncludesInFile")] public static extern CXResult FindIncludesInFile(CXTranslationUnit TU, CXFile file, CXCursorAndRangeVisitor visitor);
 }
 
-[CRepr] public struct _CXCursorAndRangeVisitorBlock; public struct CXCursorAndRangeVisitorBlock : this(_CXCursorAndRangeVisitorBlock* ptr);
+[CRepr] public struct _CXCursorAndRangeVisitorBlock; public struct CXCursorAndRangeVisitorBlock : int {}
 
 
 
@@ -6176,24 +6176,24 @@ extension Clang
 /**
  * The client's data object that is associated with a CXFile.
  */
-public struct CXIdxClientFile : this(void* ptr);
+public struct CXIdxClientFile : int {}
 
 /**
  * The client's data object that is associated with a semantic entity.
  */
-public struct CXIdxClientEntity : this(void* ptr);
+public struct CXIdxClientEntity : int {}
 
 /**
  * The client's data object that is associated with a semantic container
  * of entities.
  */
-public struct CXIdxClientContainer : this(void* ptr);
+public struct CXIdxClientContainer : int {}
 
 /**
  * The client's data object that is associated with an AST file (PCH
  * or module).
  */
-public struct CXIdxClientASTFile : this(void* ptr);
+public struct CXIdxClientASTFile : int {}
 
 /**
  * Source location passed to index callbacks.
@@ -6604,7 +6604,7 @@ extension Clang
  * An indexing action/session, to be applied to one or multiple
  * translation units.
  */
-public struct CXIndexAction : this(void* ptr);
+public struct CXIndexAction : int {}
 
 extension Clang
 {
@@ -6969,7 +6969,7 @@ extension Clang
  */
 
 /* CINDEX_DEPRECATED - disabled to silence MSVC deprecation warnings */
-public struct CXRemapping : this(void* ptr);
+public struct CXRemapping : int {}
 
 extension Clang
 {
diff --git a/src/Rewrite.bf b/src/Rewrite.bf
index 90d3b0c..d34ca44 100644
--- a/src/Rewrite.bf
+++ b/src/Rewrite.bf
@@ -29,7 +29,7 @@ static
 
 
 
-public struct CXRewriter : this(void* ptr);
+public struct CXRewriter : int {}
 
 extension Clang
 {