diff --git a/api/GenerateStubsWhiteList.cpp b/api/GenerateStubsWhiteList.cpp
index ea18eed..9b4297d 100644
--- a/api/GenerateStubsWhiteList.cpp
+++ b/api/GenerateStubsWhiteList.cpp
@@ -70,21 +70,14 @@
             }
             switch (spec->getKind()) {
                 case SIMPLE: {
-                    /* For simple typedefs, replace it unless it's the special case of _RS_HANDLE
-                     * which is a macro of a struct.
-                     */
-                    const string s = spec->getSimpleType();
-                    if (s != "_RS_HANDLE") {
-                        return s;
-                    }
+                    return spec->getSimpleType();
+                }
+                case RS_OBJECT: {
+                    // Do nothing for RS object types.
                     break;
                 }
                 case STRUCT: {
-                    const string s = spec->getStructName();
-                    if (!s.empty()) {
-                        return s;
-                    }
-                    break;
+                    return spec->getStructName();
                 }
                 case ENUM:
                     // Do nothing