diff --git a/target/arc/cpu-qom.h b/target/arc/cpu-qom.h
index c09fc5abee..f54a015e2a 100644
--- a/target/arc/cpu-qom.h
+++ b/target/arc/cpu-qom.h
@@ -24,11 +24,8 @@
 
 #define TYPE_ARC_CPU            "arc-cpu"
 
-typedef struct ArchCPU ARCCPU;
-typedef struct ARCCPUClass ARCCPUClass;
 typedef struct CPUArchState CPUARCState;
-DECLARE_OBJ_CHECKERS(ARCCPU, ARCCPUClass,
-                     ARC_CPU, TYPE_ARC_CPU)
+OBJECT_DECLARE_CPU_TYPE(ARCCPU, ARCCPUClass, ARC_CPU)
 
 /*
  *  ARCCPUClass:
@@ -37,13 +34,13 @@ DECLARE_OBJ_CHECKERS(ARCCPU, ARCCPUClass,
  *
  *  A ARC CPU model.
  */
-typedef struct ARCCPUClass {
+struct ARCCPUClass {
     /*< private >*/
     CPUClass parent_class;
     /*< public >*/
 
     DeviceRealize parent_realize;
     DeviceReset parent_reset;
-} ARCCPUClass;
+};
 
 #endif
diff --git a/target/arc/mmu-common.h b/target/arc/mmu-common.h
index 0bc7649a11..c5ed5d109d 100644
--- a/target/arc/mmu-common.h
+++ b/target/arc/mmu-common.h
@@ -80,8 +80,6 @@ struct mem_exception {
   (EXCP).parameter = P; \
 }
 
-struct CPUARCState;
-
 /* ARCv2 MMU functions */
 void arc_mmu_init_v3(CPUARCState *env);
 bool