diff --git a/src/asmjit/base/operand.cpp b/src/asmjit/base/operand.cpp
index f00564d..76e0b0a 100644
--- a/src/asmjit/base/operand.cpp
+++ b/src/asmjit/base/operand.cpp
@@ -20,7 +20,8 @@ namespace asmjit {
 // ============================================================================
 
 // Prevent static initialization.
-struct Operand {
+class Operand {
+ public:
   struct BaseOp {
     uint8_t op;
     uint8_t size;
diff --git a/src/asmjit/base/operand.h b/src/asmjit/base/operand.h
index 10a33ea..3b46d8c 100644
--- a/src/asmjit/base/operand.h
+++ b/src/asmjit/base/operand.h
@@ -20,8 +20,8 @@ namespace asmjit {
 // [Forward Declarations]
 // ============================================================================
 
-struct Assembler;
-struct Compiler;
+class Assembler;
+class Compiler;
 
 //! \addtogroup asmjit_base
 //! \{