diff --git a/headers/os/package/PackageResolvable.h b/headers/os/package/PackageResolvable.h
index aad9f3e90c..fe4eca0856 100644
--- a/headers/os/package/PackageResolvable.h
+++ b/headers/os/package/PackageResolvable.h
@@ -15,7 +15,7 @@ namespace BPackageKit {
 
 
 namespace BHPKG {
-	class BPackageResolvableData;
+	struct BPackageResolvableData;
 }
 using BHPKG::BPackageResolvableData;
 
diff --git a/headers/os/package/PackageResolvableExpression.h b/headers/os/package/PackageResolvableExpression.h
index 5236a1f1a6..b24c234b01 100644
--- a/headers/os/package/PackageResolvableExpression.h
+++ b/headers/os/package/PackageResolvableExpression.h
@@ -16,7 +16,7 @@ namespace BPackageKit {
 
 
 namespace BHPKG {
-	class BPackageResolvableExpressionData;
+	struct BPackageResolvableExpressionData;
 }
 using BHPKG::BPackageResolvableExpressionData;
 
diff --git a/headers/os/package/PackageVersion.h b/headers/os/package/PackageVersion.h
index 5333158c72..437aedd297 100644
--- a/headers/os/package/PackageVersion.h
+++ b/headers/os/package/PackageVersion.h
@@ -13,7 +13,7 @@ namespace BPackageKit {
 
 
 namespace BHPKG {
-	class BPackageVersionData;
+	struct BPackageVersionData;
 }
 using BHPKG::BPackageVersionData;
 
diff --git a/headers/os/package/hpkg/RepositoryContentHandler.h b/headers/os/package/hpkg/RepositoryContentHandler.h
index 71e0b2db96..4f6d16e138 100644
--- a/headers/os/package/hpkg/RepositoryContentHandler.h
+++ b/headers/os/package/hpkg/RepositoryContentHandler.h
@@ -20,7 +20,7 @@ class BRepositoryInfo;
 namespace BHPKG {
 
 
-class BPackageInfoAttributeValue;
+struct BPackageInfoAttributeValue;
 
 
 class BRepositoryContentHandler {
diff --git a/headers/private/package/hpkg/RepositoryWriterImpl.h b/headers/private/package/hpkg/RepositoryWriterImpl.h
index 4c5e5cda83..188428401e 100644
--- a/headers/private/package/hpkg/RepositoryWriterImpl.h
+++ b/headers/private/package/hpkg/RepositoryWriterImpl.h
@@ -22,7 +22,7 @@ namespace BHPKG {
 
 class BPackageEntry;
 class BPackageEntryAttribute;
-class BPackageInfoAttributeValue;
+struct BPackageInfoAttributeValue;
 
 
 namespace BPrivate {