[gnome-builder] libide: cleanup some type definitions

[Christian Hergert <chergert src gnome org>]

commit 5a7ee7efdc4a6b30ccc21b1fd7d2be9a3c6f3c43
Author: Christian Hergert <chergert redhat com>
Date:   Fri Jun 15 21:54:23 2018 -0700

    libide: cleanup some type definitions

 src/libide/completion/ide-completion-types.h | 13 ++-----------
 src/libide/ide-types.h                       | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/src/libide/completion/ide-completion-types.h b/src/libide/completion/ide-completion-types.h
index a86c42cfe..ee7c64f2e 100644
--- a/src/libide/completion/ide-completion-types.h
+++ b/src/libide/completion/ide-completion-types.h
@@ -18,18 +18,9 @@
 
 #pragma once
 
-G_BEGIN_DECLS
+#include "ide-types.h"
 
-typedef struct _IdeCompletion           IdeCompletion;
-typedef struct _IdeCompletionContext    IdeCompletionContext;
-typedef struct _IdeCompletionDisplay    IdeCompletionDisplay;
-typedef struct _IdeCompletionListBox    IdeCompletionListBox;
-typedef struct _IdeCompletionListBoxRow IdeCompletionListBoxRow;
-typedef struct _IdeCompletionOverlay    IdeCompletionOverlay;
-typedef struct _IdeCompletionProposal   IdeCompletionProposal;
-typedef struct _IdeCompletionProvider   IdeCompletionProvider;
-typedef struct _IdeCompletionView       IdeCompletionView;
-typedef struct _IdeCompletionWindow     IdeCompletionWindow;
+G_BEGIN_DECLS
 
 typedef enum
 {
diff --git a/src/libide/ide-types.h b/src/libide/ide-types.h
index fd8180bdb..885207f8a 100644
--- a/src/libide/ide-types.h
+++ b/src/libide/ide-types.h
@@ -32,6 +32,17 @@ typedef struct _IdeBuildStage                  IdeBuildStage;
 typedef struct _IdeBuildSystem                 IdeBuildSystem;
 typedef struct _IdeBuildTarget                 IdeBuildTarget;
 
+typedef struct _IdeCompletion                  IdeCompletion;
+typedef struct _IdeCompletionContext           IdeCompletionContext;
+typedef struct _IdeCompletionDisplay           IdeCompletionDisplay;
+typedef struct _IdeCompletionListBox           IdeCompletionListBox;
+typedef struct _IdeCompletionListBoxRow        IdeCompletionListBoxRow;
+typedef struct _IdeCompletionOverlay           IdeCompletionOverlay;
+typedef struct _IdeCompletionProposal          IdeCompletionProposal;
+typedef struct _IdeCompletionProvider          IdeCompletionProvider;
+typedef struct _IdeCompletionView              IdeCompletionView;
+typedef struct _IdeCompletionWindow            IdeCompletionWindow;
+
 typedef struct _IdeConfiguration               IdeConfiguration;
 typedef struct _IdeConfigurationManager        IdeConfigurationManager;
 
@@ -132,6 +143,10 @@ typedef struct _IdeUnsavedFile                 IdeUnsavedFile;
 typedef struct _IdeUnsavedFiles                IdeUnsavedFiles;
 
 typedef struct _IdeVcs                         IdeVcs;
+typedef struct _IdeVcsConfig                   IdeVcsConfig;
 typedef struct _IdeVcsMonitor                  IdeVcsMonitor;
+typedef struct _IdeVcsInitializer              IdeVcsInitializer;
+typedef struct _IdeVcsFileInfo                 IdeVcsFileInfo;
+typedef struct _IdeVcsUri                      IdeVcsUri;
 
 G_END_DECLS