diff --git a/gl-host-common/include/host-common/opengles.h b/gl-host-common/include/host-common/opengles.h
index 3101ba2..0b67674 100644
--- a/gl-host-common/include/host-common/opengles.h
+++ b/gl-host-common/include/host-common/opengles.h
@@ -22,7 +22,10 @@
 #include "host-common/vm_operations.h"
 #include "host-common/window_agent.h"
 #include "render-utils/virtio_gpu_ops.h"
+
+#ifdef __cplusplus
 #include "render-utils/RenderLib.h"
+#endif
 
 #ifndef USING_ANDROID_BP
 ANDROID_BEGIN_HEADER
@@ -139,11 +142,13 @@
 
 AEMU_EXPORT void android_waitForOpenglesProcessCleanup();
 
+#ifdef __cplusplus
 namespace gfxstream {
 class Renderer;
 }
 
 AEMU_EXPORT const gfxstream::RendererPtr& android_getOpenglesRenderer();
+#endif
 
 AEMU_EXPORT struct AndroidVirtioGpuOps* android_getVirtioGpuOps(void);
 
diff --git a/stream-servers/IOStream.h b/include/render-utils/IOStream.h
similarity index 100%
rename from stream-servers/IOStream.h
rename to include/render-utils/IOStream.h
diff --git a/stream-servers/render_api.h b/include/render-utils/render_api.h
similarity index 100%
rename from stream-servers/render_api.h
rename to include/render-utils/render_api.h
diff --git a/stream-servers/FrameBuffer.h b/stream-servers/FrameBuffer.h
index 4544d95..318de77 100644
--- a/stream-servers/FrameBuffer.h
+++ b/stream-servers/FrameBuffer.h
@@ -61,7 +61,7 @@
 #include "gl/TextureDraw.h"
 #include "render-utils/Renderer.h"
 #include "render-utils/virtio_gpu_ops.h"
-#include "render_api.h"
+#include "render-utils/render_api.h"
 #include "snapshot/common.h"
 #include "utils/RenderDoc.h"
 #include "vulkan/vk_util.h"
diff --git a/stream-servers/RenderWindow.h b/stream-servers/RenderWindow.h
index 5a21302..907e635 100644
--- a/stream-servers/RenderWindow.h
+++ b/stream-servers/RenderWindow.h
@@ -15,7 +15,7 @@
 #ifndef ANDROID_EMUGL_LIBRENDER_RENDER_WINDOW_H
 #define ANDROID_EMUGL_LIBRENDER_RENDER_WINDOW_H
 
-#include "render_api.h"
+#include "render-utils/render_api.h"
 
 #include "aemu/base/synchronization/MessageChannel.h"
 #include "aemu/base/threads/FunctorThread.h"
diff --git a/stream-servers/render_api.cpp b/stream-servers/render_api.cpp
index 3fd202b..a133c1a 100644
--- a/stream-servers/render_api.cpp
+++ b/stream-servers/render_api.cpp
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#include "render_api.h"
+#include "render-utils/render_api.h"
 
 #include "host-common/logging.h"
 #include "RenderLibImpl.h"