diff --git a/src/apps/packageinstaller/InstalledPackageInfo.cpp b/src/apps/packageinstaller/InstalledPackageInfo.cpp
index b5768e16ed..345c2afb2a 100644
--- a/src/apps/packageinstaller/InstalledPackageInfo.cpp
+++ b/src/apps/packageinstaller/InstalledPackageInfo.cpp
@@ -8,12 +8,13 @@
 
 
 #include "InstalledPackageInfo.h"
-#include <Directory.h>
-#include <FindDirectory.h>
-#include <Entry.h>
+
 #include <stdio.h>
 #include <string.h>
-#include <posix/string.h>
+
+#include <Directory.h>
+#include <Entry.h>
+#include <FindDirectory.h>
 
 
 const char * kPackagesDir = "packages";
@@ -215,7 +216,7 @@ InstalledPackageInfo::Uninstall()
 	// Try to remove all entries that are present in the list
 	for (i = 0; i < count; i++) {
 		iter = static_cast<BString *>(fInstalledItems.ItemAt(count - i - 1));
-		fprintf(stderr, "Removing: %s (%d/%d)\n", iter->String(), i, count);
+		fprintf(stderr, "Removing: %s (%ld/%ld)\n", iter->String(), i, count);
 		ret = entry.SetTo(iter->String());
 		if (ret == B_BUSY) {
 			// The entry's directory is locked - wait a few cycles for it to
diff --git a/src/apps/packageinstaller/PackageView.h b/src/apps/packageinstaller/PackageView.h
index 68cab1f35a..88e738bed6 100644
--- a/src/apps/packageinstaller/PackageView.h
+++ b/src/apps/packageinstaller/PackageView.h
@@ -5,17 +5,23 @@
  * Author:
  *		Łukasz 'Sil2100' Zemczak <sil2100@vexillium.org>
  */
-#ifndef PACKAGEVIEW_H
-#define PACKAGEVIEW_H
+#ifndef PACKAGE_VIEW_H
+#define PACKAGE_VIEW_H
+
 
 #include "PackageInfo.h"
 #include "PackageStatus.h"
+
 #include <View.h>
 #include <Box.h>
 #include <Button.h>
 #include <MenuField.h>
 #include <FilePanel.h>
 
+class BPopUpMenu;
+class BTextView;
+
+
 enum {
 	P_MSG_GROUP_CHANGED = 'gpch',
 	P_MSG_PATH_CHANGED,
@@ -23,7 +29,6 @@ enum {
 	P_MSG_INSTALL
 };
 
-
 class PackageView : public BView {
 	public:
 		PackageView(BRect frame, const entry_ref *ref);
@@ -54,6 +59,5 @@ class PackageView : public BView {
 		PackageStatus *fStatusWindow;
 };
 
-
-#endif
+#endif	// PACKAGE_VIEW_H