diff --git a/glibtop.h b/glibtop.h
index 5e9bba87..4b13da5e 100644
--- a/glibtop.h
+++ b/glibtop.h
@@ -38,17 +38,13 @@
 
 BEGIN_LIBGTOP_DECLS
 
-typedef struct _glibtop			glibtop;
+typedef struct _glibtop glibtop;
 
 #include <glibtop/sysdeps.h>
 #include <glibtop/errors.h>
 
 #include <glibtop/glibtop-server.h>
 
-#ifdef _IN_LIBGTOP
-#include <glibtop-server-private.h>
-#endif
-
 glibtop *
 glibtop_init_r (glibtop **server_ptr,
 		unsigned long features,
diff --git a/glibtop-server-private.h b/lib/glibtop-server-private.h
similarity index 95%
rename from glibtop-server-private.h
rename to lib/glibtop-server-private.h
index c17b28a8..403844ee 100644
--- a/glibtop-server-private.h
+++ b/lib/glibtop-server-private.h
@@ -32,6 +32,8 @@
 
 #include <glib.h>
 
+typedef struct _glibtop_server_private glibtop_server_private;
+
 struct _glibtop_server_private
 {
 #ifdef HAVE_GLIBTOP_MACHINE_H